From owner-p4-projects@FreeBSD.ORG  Wed Aug 20 11:40:54 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF20B16A4C3; Wed, 20 Aug 2003 11:40:53 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7ADD116A4C2
	for <perforce@freebsd.org>; Wed, 20 Aug 2003 11:40:53 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9BD2143FCB
	for <perforce@freebsd.org>; Wed, 20 Aug 2003 11:40:52 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7KIeq0U083522
	for <perforce@freebsd.org>; Wed, 20 Aug 2003 11:40:52 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7KIeqNV083519
	for perforce@freebsd.org; Wed, 20 Aug 2003 11:40:52 -0700 (PDT)
Date: Wed, 20 Aug 2003 11:40:52 -0700 (PDT)
Message-Id: <200308201840.h7KIeqNV083519@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36508 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Aug 2003 18:40:54 -0000

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

Change 36508 by cvance@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