PERFORCE change 36508 for review

[Chris Vance]

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

Change 36508 by cvance at cvance_osx_laptop on 2003/08/20 11:40:20

	Back these changes out. Darwin has both a static and a dynamic 
	system control infrastructure.  Try using only the dynamic one.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mib.c#3 edit
.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/sysctl_init.c#3 edit
.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/sysctl.h#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mib.c#3 (text+ko) ====

@@ -89,6 +89,4 @@
 	"machine dependent");
 SYSCTL_NODE(, CTL_USER,	  user,   CTLFLAG_RW, 0,
 	"user-level");
-SYSCTL_NODE(, CTL_SECURITY, security,   CTLFLAG_RW, 0,
-	"security");
 

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/sysctl_init.c#3 (text+ko) ====

@@ -258,7 +258,6 @@
 extern struct sysctl_oid sysctl__net;
 extern struct sysctl_oid sysctl__debug;
 extern struct sysctl_oid sysctl__vfs;
-extern struct sysctl_oid sysctl__security;
 extern struct sysctl_oid sysctl__sysctl;
 
 #if INET6
@@ -360,7 +359,6 @@
     &sysctl__net,
     &sysctl__debug,
     &sysctl__vfs,
-    &sysctl__security,
     &sysctl__sysctl,
     &sysctl__debug_bpf_bufsize,
     &sysctl__debug_bpf_maxbufsize

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/sysctl.h#4 (text+ko) ====

@@ -245,8 +245,7 @@
 #define	CTL_HW		6		/* generic cpu/io */
 #define	CTL_MACHDEP	7		/* machine dependent */
 #define	CTL_USER	8		/* user-level */
-#define CTL_SECURITY	9		/* security information */
-#define	CTL_MAXID	10		/* number of valid top-level ids */
+#define	CTL_MAXID	9		/* number of valid top-level ids */
 
 #define CTL_NAMES { \
 	{ 0, 0 }, \
@@ -258,7 +257,6 @@
 	{ "hw", CTLTYPE_NODE }, \
 	{ "machdep", CTLTYPE_NODE }, \
 	{ "user", CTLTYPE_NODE }, \
-	{ "security", CTLTYPE_NODE }, \
 }
 
 /*
@@ -607,7 +605,6 @@
 SYSCTL_DECL(_hw);
 SYSCTL_DECL(_machdep);
 SYSCTL_DECL(_user);
-SYSCTL_DECL(_security);
 
 
 #ifdef DEBUG
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message