PERFORCE change 64901 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=64901

Change 64901 by rwatson at rwatson_tislabs on 2004/11/11 19:58:22

	Integrate System V IPC sysctl fix to SEBSD branch.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_msg.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_sem.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_shm.c#4 integrate

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_msg.c#4 (text+ko) ====

@@ -54,7 +54,7 @@
 #include <security/mac/mac_internal.h>
 
 static int	mac_enforce_sysv_msg = 1;
-SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW,
+SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_msg, CTLFLAG_RW,
     &mac_enforce_sysv_msg, 0,
     "Enforce MAC policy on System V IPC Message Queues");
 TUNABLE_INT("security.mac.enforce_sysv_msg", &mac_enforce_sysv_msg);

==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_sem.c#4 (text+ko) ====

@@ -54,7 +54,7 @@
 #include <security/mac/mac_internal.h>
 
 static int	mac_enforce_sysv_sem = 1;
-SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW,
+SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_sem, CTLFLAG_RW,
     &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores");
 TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_sem);
 

==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_shm.c#4 (text+ko) ====

@@ -54,7 +54,7 @@
 #include <security/mac/mac_internal.h>
 
 static int	mac_enforce_sysv_shm = 1;
-SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW,
+SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_shm, CTLFLAG_RW,
     &mac_enforce_sysv_shm, 0,
     "Enforce MAC policy on System V IPC shared memory");
 TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message