From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 00:31:49 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5820616A4D2; Sun, 11 Jan 2004 00:31:49 -0800 (PST)
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 2D33516A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:31:49 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ABFED43D58
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:31:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B8Vl0B006005
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:31:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B8VlEh005999
	for perforce@freebsd.org; Sun, 11 Jan 2004 00:31:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 00:31:47 -0800 (PST)
Message-Id: <200401110831.i0B8VlEh005999@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45121 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: Sun, 11 Jan 2004 08:31:50 -0000

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

Change 45121 by jmallett@jmallett_oingo on 2004/01/11 00:31:09

	Match other 64-bit platforms.  Time to use __LP64__ in these
	places?

Affected files ...

.. //depot/projects/mips/sys/sys/param.h#14 edit

Differences ...

==== //depot/projects/mips/sys/sys/param.h#14 (text+ko) ====

@@ -299,7 +299,7 @@
  * Constraints: PAGE_SIZE <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
  * MAXALLOCSIZE must be a power of two.
  */
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
+#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined (__mips__)
 #define MINBUCKET	5		/* 5 => min allocation of 32 bytes */
 #else
 #define MINBUCKET	4		/* 4 => min allocation of 16 bytes */

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 00:31:50 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9827516A4FB; Sun, 11 Jan 2004 00:31:49 -0800 (PST)
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 31C5B16A4D0
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:31:49 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1BF8043D5A
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:31:48 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B8Vl0B006017
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:31:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B8Vl5a006011
	for perforce@freebsd.org; Sun, 11 Jan 2004 00:31:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 00:31:47 -0800 (PST)
Message-Id: <200401110831.i0B8Vl5a006011@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45122 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: Sun, 11 Jan 2004 08:31:50 -0000

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

Change 45122 by jmallett@jmallett_oingo on 2004/01/11 00:31:27

	Uninitialized variable.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/db_trace.c#8 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/db_trace.c#8 (text+ko) ====

@@ -107,6 +107,7 @@
 	pc = ddb_regs.f_regs[PC];
 
 	for (;;) {
+		func = 0;
 		stacksize = 0;
 		if (pc <= (u_register_t)btext)
 			break;

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 00:32:51 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE3DE16A4D1; Sun, 11 Jan 2004 00:32:50 -0800 (PST)
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 C8DB316A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:32:50 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E95AE43D54
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:32:49 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B8Wn0B006433
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 00:32:49 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B8WnqW006430
	for perforce@freebsd.org; Sun, 11 Jan 2004 00:32:49 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 00:32:49 -0800 (PST)
Message-Id: <200401110832.i0B8WnqW006430@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45123 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: Sun, 11 Jan 2004 08:32:51 -0000

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

Change 45123 by jmallett@jmallett_oingo on 2004/01/11 00:31:54

	Match other platforms in flag setting-up.

Affected files ...

.. //depot/projects/mips/sys/conf/Makefile.mips#12 edit
.. //depot/projects/mips/sys/conf/kern.mk#7 edit

Differences ...

==== //depot/projects/mips/sys/conf/Makefile.mips#12 (text+ko) ====

@@ -41,9 +41,7 @@
 .include "$S/conf/kern.pre.mk"
 
 MIPSOPTS?= -mips3
-COPTS+= ${MIPSOPTS} -mno-abicalls -fno-pic -msoft-float
-
-CFLAGS+= -D${PLATFORM}
+CFLAGS+= -D${PLATFORM} ${MIPSOPTS}
 
 .if defined(TEXTADDR)
 LDFLAGS+= -Ttext ${TEXTADDR}

==== //depot/projects/mips/sys/conf/kern.mk#7 (text+ko) ====

@@ -77,6 +77,14 @@
 .endif
 
 #
+# For MIPS, disable ABI cals, PIC, and tell GCC to use soft floating.
+#
+.if ${MACHINE_ARCH} == "mips"
+CFLAGS+=	-mno-abicalls -fno-pic -msoft-float
+INLINE_LIMIT?=	15000
+.endif
+
+#
 # GCC 3.0 and above like to do certain optimizations based on the
 # assumption that the program is linked against libc.  Stop this.
 #

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 01:23:56 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CAF9016A4D2; Sun, 11 Jan 2004 01:23:55 -0800 (PST)
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 A219716A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 01:23:55 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9453D43D1D
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 01:23:54 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B9Ns0B023491
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 01:23:54 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B9NssU023488
	for perforce@freebsd.org; Sun, 11 Jan 2004 01:23:54 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 01:23:54 -0800 (PST)
Message-Id: <200401110923.i0B9NssU023488@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45126 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: Sun, 11 Jan 2004 09:23:56 -0000

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

Change 45126 by jmallett@jmallett_oingo on 2004/01/11 01:23:39

	Make INET build.

Affected files ...

.. //depot/projects/mips/sys/conf/files.mips#27 edit
.. //depot/projects/mips/sys/mips/include/in_cksum.h#1 add
.. //depot/projects/mips/sys/mips/mips/in_cksum.c#1 add
.. //depot/projects/mips/sys/net/if_loop.c#11 edit

Differences ...

==== //depot/projects/mips/sys/conf/files.mips#27 (text+ko) ====

@@ -14,6 +14,7 @@
 mips/mips/critical.c		standard
 mips/mips/elf_machdep.c		standard
 mips/mips/exception.S		standard
+mips/mips/in_cksum.c		optional	inet
 mips/mips/locore.S		standard	no-obj
 mips/mips/locore_mips3.S	standard
 mips/mips/machdep.c		standard

==== //depot/projects/mips/sys/net/if_loop.c#11 (text+ko) ====

@@ -265,7 +265,7 @@
 	/* Strip away media header */
 	if (hlen > 0) {
 		m_adj(m, hlen);
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
+#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__mips__)
 		/* The alpha doesn't like unaligned data.
 		 * We move data down in the first mbuf */
 		if (mtod(m, vm_offset_t) & 3) {

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 02:56:52 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 45E8B16A4D1; Sun, 11 Jan 2004 02:56:52 -0800 (PST)
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 1EE5616A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:56:52 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 89B2043D2D
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:56:50 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BAuo0B043611
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:56:50 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BAuo68043608
	for perforce@freebsd.org; Sun, 11 Jan 2004 02:56:50 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 02:56:50 -0800 (PST)
Message-Id: <200401111056.i0BAuo68043608@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45132 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: Sun, 11 Jan 2004 10:56:52 -0000

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

Change 45132 by jmallett@jmallett_oingo on 2004/01/11 02:56:22

	Give a swing at doing an imc driver using the header and ideas
	from NetBSD, without GIO stuff.  Doesn't seem to show up, but I
	suspect that's just me being dumb.

Affected files ...

.. //depot/projects/mips/sys/conf/files.mips#28 edit
.. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#1 add
.. //depot/projects/mips/sys/mips/sgimips/imc/imcreg.h#1 add

Differences ...

==== //depot/projects/mips/sys/conf/files.mips#28 (text+ko) ====

@@ -54,6 +54,8 @@
 dev/arcs/arcs.c			optional	arcs
 dev/arcs/arcs_console.c		optional	arcs
 
+mips/sgimips/imc/imc.c		optional	imc
+
 libkern/bcmp.c			standard
 libkern/ffs.c			standard
 libkern/ucmpdi2.c		standard

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 02:57:55 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7792916A4D1; Sun, 11 Jan 2004 02:57:55 -0800 (PST)
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 5193A16A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:57:55 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6E14F43D45
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:57:52 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BAvq0B043649
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:57:52 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BAvp35043646
	for perforce@freebsd.org; Sun, 11 Jan 2004 02:57:51 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 02:57:51 -0800 (PST)
Message-Id: <200401111057.i0BAvp35043646@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45133 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: Sun, 11 Jan 2004 10:57:55 -0000

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

Change 45133 by jmallett@jmallett_oingo on 2004/01/11 02:56:52

	Er, remove printfs.

Affected files ...

.. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#2 edit

Differences ...

==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#1 $
+ * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#2 $
  */
 
 #include <sys/cdefs.h>
@@ -67,7 +67,6 @@
 static int
 imc_probe(device_t dev)
 {
-	printf("imc_probe!\n");
 	switch (mach_type) {
 	case MACH_SGI_IP22:
 		/* Attach GIO. */
@@ -90,8 +89,6 @@
 	uint32_t sysid;
 	uint32_t reg;
 
-	printf("imc attach\n");
-
 	sysid = IMC_READ_4(port, IMC_SYSID);
 	device_printf(dev, "revision %d, EISA %s\n", sysid & IMC_SYSID_REVMASK, sysid & IMC_SYSID_HAVEISA ? "present" : "not present");
 

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 02:57:56 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C0DF16A4D7; Sun, 11 Jan 2004 02:57:56 -0800 (PST)
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 803B116A4D4
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:57:55 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F023843D53
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:57:52 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BAvq0B043655
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 02:57:52 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BAvq3d043652
	for perforce@freebsd.org; Sun, 11 Jan 2004 02:57:52 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 02:57:52 -0800 (PST)
Message-Id: <200401111057.i0BAvq3d043652@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45134 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: Sun, 11 Jan 2004 10:57:56 -0000

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

Change 45134 by jmallett@jmallett_oingo on 2004/01/11 02:57:38

	Throw more junk into the kernel.

Affected files ...

.. //depot/projects/mips/sys/mips/conf/INDY#4 edit

Differences ...

==== //depot/projects/mips/sys/mips/conf/INDY#4 (text+ko) ====

@@ -18,6 +18,7 @@
 
 # Hardware support
 device		arcs			#ARCS Firmware + Console
+device		imc			#IMC bus.
 
 # Debugging for use in -current
 options 	DDB			#Enable the kernel debugger
@@ -26,6 +27,11 @@
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
+options 	FFS
+options 	INET
+device		ether
+device		loop
+
 options 	SCHED_4BSD		#A scheduler, if you please
 
 # Other options

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 03:14:22 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0370916A4D1; Sun, 11 Jan 2004 03:14:22 -0800 (PST)
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 B6C4816A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 03:14:21 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D82B843D1D
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 03:14:17 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BBEH0B048729
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 03:14:17 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BBED6t048726
	for perforce@freebsd.org; Sun, 11 Jan 2004 03:14:13 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 03:14:13 -0800 (PST)
Message-Id: <200401111114.i0BBED6t048726@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45135 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: Sun, 11 Jan 2004 11:14:22 -0000

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

Change 45135 by jmallett@jmallett_oingo on 2004/01/11 03:14:01

	IFC.

Affected files ...

.. //depot/projects/mips/bin/date/date.1#3 integrate
.. //depot/projects/mips/contrib/gcc/c-lex.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/alpha/linux-ecoff.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/alpha/osf12.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/alpha/osf2or3.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/arm/arm-wince-pe.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/arm/riscix.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/arm/riscix1-1.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/arm/rix-gas.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/arm/t-riscix#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-c4x.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-i128.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-i32.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-i386.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-i64.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-m68k.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-sh.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-sparc.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/float-vax.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/386bsd.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/aix386.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/aix386ng.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/bsd386.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/dgux.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/djgpp-rtems.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/interix.c#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/isc.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/isccoff.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/iscdbx.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/linux-oldld.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/next.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/osf1-ci.asm#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/osf1-cn.asm#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/osf1elf.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/osf1elfgdb.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/osfelf.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/osfrose.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/rtems.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/seq-gas.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/seq-sysv3.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/seq2-sysv3.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/sequent.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/sol2gas.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/sun.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/sun386.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/t-dgux#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/t-next#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/t-osf#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/t-osf1elf#2 delete
.. //depot/projects/mips/contrib/gcc/config/i386/t-sco5gas#3 delete
.. //depot/projects/mips/contrib/gcc/config/i386/v3gas.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/nextstep-protos.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/nextstep.c#2 delete
.. //depot/projects/mips/contrib/gcc/config/nextstep.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/nextstep21.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/rs6000/softfloat.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/s390/t-linux#2 delete
.. //depot/projects/mips/contrib/gcc/config/sparc/rtems.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/sparc/sol2-g1.asm#2 delete
.. //depot/projects/mips/contrib/gcc/config/sparc/sol27-sld.h#2 delete
.. //depot/projects/mips/contrib/gcc/config/t-install-cpp#2 delete
.. //depot/projects/mips/contrib/gcc/cp/mpw-config.in#2 delete
.. //depot/projects/mips/contrib/gcc/cp/mpw-make.sed#2 delete
.. //depot/projects/mips/contrib/gcc/dependence.c#2 delete
.. //depot/projects/mips/contrib/gcc/doc/vms.texi#2 delete
.. //depot/projects/mips/contrib/gcc/enquire.c#2 delete
.. //depot/projects/mips/contrib/gcc/f/version.c#5 delete
.. //depot/projects/mips/contrib/gcc/f/version.h#2 delete
.. //depot/projects/mips/contrib/gcc/function.c#5 integrate
.. //depot/projects/mips/contrib/gcc/ggc-callbacks.c#2 delete
.. //depot/projects/mips/contrib/gcc/halfpic.c#2 delete
.. //depot/projects/mips/contrib/gcc/halfpic.h#2 delete
.. //depot/projects/mips/contrib/gcc/hash.c#2 delete
.. //depot/projects/mips/contrib/gcc/hash.h#2 delete
.. //depot/projects/mips/contrib/gcc/tradcif.y#2 delete
.. //depot/projects/mips/contrib/gcc/tradcpp.c#4 delete
.. //depot/projects/mips/contrib/gcc/tradcpp.h#2 delete
.. //depot/projects/mips/contrib/libf2c/ChangeLog.egcs#2 delete
.. //depot/projects/mips/contrib/libf2c/libI77/rawio.h#2 delete
.. //depot/projects/mips/contrib/libobjc/objc-features.texi#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/generic/bits/limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/aix/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/aix/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/aix/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/generic/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/generic/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#3 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/hpux/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/newlib/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/configure.host#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/backward/strstream.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/bits/generic_shadow.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/bits/slice.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/assert.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_climits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/ctype.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/errno.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/fcntl.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/features.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/float.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/iconv.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/iolibio.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/langinfo.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/libio.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/libioP.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/limits.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/locale.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/math.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/pthread.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/setjmp.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/signal.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/stdarg.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/stddef.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/stdio.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/stdlib.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/string.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/sys/cdefs.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/time.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/unistd.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/wchar.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/include/c_shadow/wctype.h#2 delete
.. //depot/projects/mips/contrib/libstdc++/mkcshadow#2 delete
.. //depot/projects/mips/contrib/libstdc++/mkinclosure#2 delete
.. //depot/projects/mips/crypto/openssh/CREDITS#3 integrate
.. //depot/projects/mips/crypto/openssh/ChangeLog#4 integrate
.. //depot/projects/mips/crypto/openssh/FREEBSD-upgrade#4 integrate
.. //depot/projects/mips/crypto/openssh/INSTALL#3 integrate
.. //depot/projects/mips/crypto/openssh/LICENCE#2 integrate
.. //depot/projects/mips/crypto/openssh/Makefile.in#4 integrate
.. //depot/projects/mips/crypto/openssh/README.dns#1 branch
.. //depot/projects/mips/crypto/openssh/README.privsep#3 integrate
.. //depot/projects/mips/crypto/openssh/README.smartcard#2 integrate
.. //depot/projects/mips/crypto/openssh/TODO#4 integrate
.. //depot/projects/mips/crypto/openssh/acconfig.h#5 integrate
.. //depot/projects/mips/crypto/openssh/atomicio.c#2 integrate
.. //depot/projects/mips/crypto/openssh/atomicio.h#2 integrate
.. //depot/projects/mips/crypto/openssh/auth-krb4.c#5 delete
.. //depot/projects/mips/crypto/openssh/auth-krb5.c#4 integrate
.. //depot/projects/mips/crypto/openssh/auth-options.c#3 integrate
.. //depot/projects/mips/crypto/openssh/auth-pam.c#5 integrate
.. //depot/projects/mips/crypto/openssh/auth-pam.h#4 integrate
.. //depot/projects/mips/crypto/openssh/auth-passwd.c#4 integrate
.. //depot/projects/mips/crypto/openssh/auth-rh-rsa.c#2 integrate
.. //depot/projects/mips/crypto/openssh/auth-rhosts.c#2 integrate
.. //depot/projects/mips/crypto/openssh/auth-rsa.c#2 integrate
.. //depot/projects/mips/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/mips/crypto/openssh/auth-sia.h#3 integrate
.. //depot/projects/mips/crypto/openssh/auth.c#4 integrate
.. //depot/projects/mips/crypto/openssh/auth.h#4 integrate
.. //depot/projects/mips/crypto/openssh/auth1.c#5 integrate
.. //depot/projects/mips/crypto/openssh/auth2-chall.c#3 integrate
.. //depot/projects/mips/crypto/openssh/auth2-gss.c#1 branch
.. //depot/projects/mips/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/mips/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/mips/crypto/openssh/auth2-pam-freebsd.c#8 delete
.. //depot/projects/mips/crypto/openssh/auth2-pam.c#5 delete
.. //depot/projects/mips/crypto/openssh/auth2-pam.h#2 delete
.. //depot/projects/mips/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/mips/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/mips/crypto/openssh/auth2.c#5 integrate
.. //depot/projects/mips/crypto/openssh/authfd.c#5 integrate
.. //depot/projects/mips/crypto/openssh/authfd.h#4 integrate
.. //depot/projects/mips/crypto/openssh/authfile.c#4 integrate
.. //depot/projects/mips/crypto/openssh/bufaux.c#3 integrate
.. //depot/projects/mips/crypto/openssh/bufaux.h#2 integrate
.. //depot/projects/mips/crypto/openssh/buffer.c#3 integrate
.. //depot/projects/mips/crypto/openssh/canohost.c#5 integrate
.. //depot/projects/mips/crypto/openssh/channels.c#6 integrate
.. //depot/projects/mips/crypto/openssh/cipher-3des1.c#1 branch
.. //depot/projects/mips/crypto/openssh/cipher-aes.c#1 branch
.. //depot/projects/mips/crypto/openssh/cipher-bf1.c#1 branch
.. //depot/projects/mips/crypto/openssh/cipher-ctr.c#1 branch
.. //depot/projects/mips/crypto/openssh/cipher.c#5 integrate
.. //depot/projects/mips/crypto/openssh/clientloop.c#4 integrate
.. //depot/projects/mips/crypto/openssh/compat.c#4 integrate
.. //depot/projects/mips/crypto/openssh/compat.h#5 integrate
.. //depot/projects/mips/crypto/openssh/config.h#4 integrate
.. //depot/projects/mips/crypto/openssh/configure.ac#4 integrate
.. //depot/projects/mips/crypto/openssh/deattack.c#3 integrate
.. //depot/projects/mips/crypto/openssh/defines.h#4 integrate
.. //depot/projects/mips/crypto/openssh/dh.c#4 integrate
.. //depot/projects/mips/crypto/openssh/dispatch.c#2 integrate
.. //depot/projects/mips/crypto/openssh/dns.c#1 branch
.. //depot/projects/mips/crypto/openssh/dns.h#1 branch
.. //depot/projects/mips/crypto/openssh/entropy.c#2 integrate
.. //depot/projects/mips/crypto/openssh/groupaccess.c#2 integrate
.. //depot/projects/mips/crypto/openssh/gss-genr.c#1 branch
.. //depot/projects/mips/crypto/openssh/gss-serv-krb5.c#1 branch
.. //depot/projects/mips/crypto/openssh/gss-serv.c#1 branch
.. //depot/projects/mips/crypto/openssh/hostfile.c#4 integrate
.. //depot/projects/mips/crypto/openssh/includes.h#4 integrate
.. //depot/projects/mips/crypto/openssh/key.c#5 integrate
.. //depot/projects/mips/crypto/openssh/key.h#3 integrate
.. //depot/projects/mips/crypto/openssh/log.c#4 integrate
.. //depot/projects/mips/crypto/openssh/log.h#4 integrate
.. //depot/projects/mips/crypto/openssh/loginrec.c#4 integrate
.. //depot/projects/mips/crypto/openssh/loginrec.h#2 integrate
.. //depot/projects/mips/crypto/openssh/logintest.c#2 integrate
.. //depot/projects/mips/crypto/openssh/md5crypt.c#2 integrate
.. //depot/projects/mips/crypto/openssh/md5crypt.h#2 integrate
.. //depot/projects/mips/crypto/openssh/mdoc2man.awk#1 branch
.. //depot/projects/mips/crypto/openssh/mdoc2man.pl#2 delete
.. //depot/projects/mips/crypto/openssh/misc.c#4 integrate
.. //depot/projects/mips/crypto/openssh/misc.h#2 integrate
.. //depot/projects/mips/crypto/openssh/moduli.c#1 branch
.. //depot/projects/mips/crypto/openssh/moduli.h#1 branch
.. //depot/projects/mips/crypto/openssh/monitor.c#5 integrate
.. //depot/projects/mips/crypto/openssh/monitor.h#3 integrate
.. //depot/projects/mips/crypto/openssh/monitor_fdpass.c#3 integrate
.. //depot/projects/mips/crypto/openssh/monitor_mm.c#3 integrate
.. //depot/projects/mips/crypto/openssh/monitor_wrap.c#4 integrate
.. //depot/projects/mips/crypto/openssh/monitor_wrap.h#3 integrate
.. //depot/projects/mips/crypto/openssh/msg.c#4 integrate
.. //depot/projects/mips/crypto/openssh/myproposal.h#2 integrate
.. //depot/projects/mips/crypto/openssh/nchan.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/Makefile.in#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/base64.h#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/basename.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/basename.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bindresvport.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-arc4random.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-cray.h#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-getpeereid.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-misc.h#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-nextstep.h#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-snprintf.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/bsd-waitpid.h#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/daemon.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/dirname.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/dirname.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-gai-errnos.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#3 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#3 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-getnameinfo.c#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-getnameinfo.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-rfc2553.c#1 branch
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-rfc2553.h#1 branch
.. //depot/projects/mips/crypto/openssh/openbsd-compat/fake-socket.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getcwd.c#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getcwd.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getgrouplist.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getopt.c#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getopt.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getrrsetbyname.c#1 branch
.. //depot/projects/mips/crypto/openssh/openbsd-compat/getrrsetbyname.h#1 branch
.. //depot/projects/mips/crypto/openssh/openbsd-compat/glob.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/glob.h#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_aton.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_ntoa.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_ntoa.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/inet_ntop.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/mktemp.c#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/mktemp.h#3 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/port-aix.h#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/port-irix.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/port-irix.h#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/realpath.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/realpath.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/rresvport.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/rresvport.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/setenv.c#4 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/setenv.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/setproctitle.h#3 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strlcat.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strlcat.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strlcpy.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strlcpy.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strmode.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strmode.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strsep.c#3 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/strsep.h#2 delete
.. //depot/projects/mips/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/vis.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/vis.h#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/xcrypt.c#1 branch
.. //depot/projects/mips/crypto/openssh/openbsd-compat/xmmap.c#2 integrate
.. //depot/projects/mips/crypto/openssh/openbsd-compat/xmmap.h#2 delete
.. //depot/projects/mips/crypto/openssh/packet.c#5 integrate
.. //depot/projects/mips/crypto/openssh/packet.h#3 integrate
.. //depot/projects/mips/crypto/openssh/progressmeter.c#2 integrate
.. //depot/projects/mips/crypto/openssh/radix.c#3 delete
.. //depot/projects/mips/crypto/openssh/radix.h#2 delete
.. //depot/projects/mips/crypto/openssh/readconf.c#4 integrate
.. //depot/projects/mips/crypto/openssh/readconf.h#3 integrate
.. //depot/projects/mips/crypto/openssh/regress/Makefile#3 integrate
.. //depot/projects/mips/crypto/openssh/regress/README.regress#1 branch
.. //depot/projects/mips/crypto/openssh/regress/agent-getpeereid.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/agent-ptrace.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/agent-timeout.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/agent.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/authorized_keys_root#2 delete
.. //depot/projects/mips/crypto/openssh/regress/dynamic-forward.sh#1 branch
.. //depot/projects/mips/crypto/openssh/regress/forwarding.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/proto-version.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/reconfigure.sh#1 branch
.. //depot/projects/mips/crypto/openssh/regress/rekey.sh#1 branch
.. //depot/projects/mips/crypto/openssh/regress/sftp-badcmds.sh#1 branch
.. //depot/projects/mips/crypto/openssh/regress/sftp-batch.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/sftp-cmds.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/sftp.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/ssh-com-client.sh#3 integrate
.. //depot/projects/mips/crypto/openssh/regress/ssh-com-keygen.sh#3 integrate
.. //depot/projects/mips/crypto/openssh/regress/ssh-com-sftp.sh#3 integrate
.. //depot/projects/mips/crypto/openssh/regress/ssh-com.sh#3 integrate
.. //depot/projects/mips/crypto/openssh/regress/stderr-after-eof.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/stderr-data.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/test-exec.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/transfer.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/try-ciphers.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/regress/yes-head.sh#2 integrate
.. //depot/projects/mips/crypto/openssh/scard-opensc.c#2 integrate
.. //depot/projects/mips/crypto/openssh/scard.c#2 integrate
.. //depot/projects/mips/crypto/openssh/scard.h#3 integrate
.. //depot/projects/mips/crypto/openssh/scp.1#3 integrate
.. //depot/projects/mips/crypto/openssh/scp.c#5 integrate
.. //depot/projects/mips/crypto/openssh/servconf.c#4 integrate
.. //depot/projects/mips/crypto/openssh/servconf.h#3 integrate
.. //depot/projects/mips/crypto/openssh/serverloop.c#5 integrate
.. //depot/projects/mips/crypto/openssh/session.c#6 integrate
.. //depot/projects/mips/crypto/openssh/session.h#4 integrate
.. //depot/projects/mips/crypto/openssh/sftp-client.c#4 integrate
.. //depot/projects/mips/crypto/openssh/sftp-common.c#4 integrate
.. //depot/projects/mips/crypto/openssh/sftp-int.c#4 integrate
.. //depot/projects/mips/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/mips/crypto/openssh/sftp-server.c#4 integrate
.. //depot/projects/mips/crypto/openssh/sftp.1#4 integrate
.. //depot/projects/mips/crypto/openssh/sftp.c#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh-add.1#3 integrate
.. //depot/projects/mips/crypto/openssh/ssh-add.c#5 integrate
.. //depot/projects/mips/crypto/openssh/ssh-agent.1#3 integrate
.. //depot/projects/mips/crypto/openssh/ssh-agent.c#6 integrate
.. //depot/projects/mips/crypto/openssh/ssh-dss.h#3 delete
.. //depot/projects/mips/crypto/openssh/ssh-gss.h#1 branch
.. //depot/projects/mips/crypto/openssh/ssh-keygen.1#3 integrate
.. //depot/projects/mips/crypto/openssh/ssh-keygen.c#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh-keyscan.1#3 integrate
.. //depot/projects/mips/crypto/openssh/ssh-keyscan.c#5 integrate
.. //depot/projects/mips/crypto/openssh/ssh-keysign.8#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh-keysign.c#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh-rand-helper.c#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh-rsa.c#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh-rsa.h#3 delete
.. //depot/projects/mips/crypto/openssh/ssh.1#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh.c#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh.h#4 integrate
.. //depot/projects/mips/crypto/openssh/ssh2.h#2 integrate
.. //depot/projects/mips/crypto/openssh/ssh_config#6 integrate
.. //depot/projects/mips/crypto/openssh/ssh_config.5#6 integrate
.. //depot/projects/mips/crypto/openssh/sshconnect.c#5 integrate
.. //depot/projects/mips/crypto/openssh/sshconnect1.c#4 integrate
.. //depot/projects/mips/crypto/openssh/sshconnect2.c#5 integrate
.. //depot/projects/mips/crypto/openssh/sshd.8#5 integrate
.. //depot/projects/mips/crypto/openssh/sshd.c#6 integrate
.. //depot/projects/mips/crypto/openssh/sshd_config#6 integrate
.. //depot/projects/mips/crypto/openssh/sshd_config.5#6 integrate
.. //depot/projects/mips/crypto/openssh/sshlogin.c#4 integrate
.. //depot/projects/mips/crypto/openssh/sshpty.c#5 integrate
.. //depot/projects/mips/crypto/openssh/sshtty.c#2 integrate
.. //depot/projects/mips/crypto/openssh/ttymodes.c#2 integrate
.. //depot/projects/mips/crypto/openssh/uidswap.c#3 integrate
.. //depot/projects/mips/crypto/openssh/version.h#6 integrate
.. //depot/projects/mips/crypto/openssl/apps/openssl.cnf#3 integrate
.. //depot/projects/mips/etc/Makefile#12 integrate
.. //depot/projects/mips/etc/moduli#2 delete
.. //depot/projects/mips/etc/rc.d/diskless#6 integrate
.. //depot/projects/mips/games/fortune/datfiles/freebsd-tips#7 integrate
.. //depot/projects/mips/gnu/lib/libstdc++/Makefile#6 integrate
.. //depot/projects/mips/gnu/usr.bin/cc/cc_int/Makefile#4 integrate
.. //depot/projects/mips/gnu/usr.bin/cc/f77/Makefile#3 integrate
.. //depot/projects/mips/gnu/usr.bin/cc/f771/Makefile#2 integrate
.. //depot/projects/mips/include/nss.h#2 integrate
.. //depot/projects/mips/lib/libc/alpha/gen/fpgetmask.c#2 integrate
.. //depot/projects/mips/lib/libc/alpha/gen/fpsetmask.c#2 integrate
.. //depot/projects/mips/lib/libc/alpha/gen/makecontext.c#4 integrate
.. //depot/projects/mips/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate
.. //depot/projects/mips/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate
.. //depot/projects/mips/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate
.. //depot/projects/mips/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate
.. //depot/projects/mips/lib/libc/gdtoa/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libc/gen/ttyname.c#3 integrate
.. //depot/projects/mips/lib/libc/gmon/mcount.c#2 integrate
.. //depot/projects/mips/lib/libc/i386/sys/i386_get_ioperm.c#3 integrate
.. //depot/projects/mips/lib/libc/i386/sys/i386_get_ldt.c#3 integrate
.. //depot/projects/mips/lib/libc/i386/sys/i386_set_ioperm.c#3 integrate
.. //depot/projects/mips/lib/libc/i386/sys/i386_set_ldt.c#3 integrate
.. //depot/projects/mips/lib/libc/i386/sys/i386_vm86.c#3 integrate
.. //depot/projects/mips/lib/libc/ia64/gen/makecontext.c#2 integrate
.. //depot/projects/mips/lib/libc/ia64/gen/signalcontext.c#2 integrate
.. //depot/projects/mips/lib/libc/locale/srune.c#2 integrate
.. //depot/projects/mips/lib/libc/locale/wcstold.c#3 integrate
.. //depot/projects/mips/lib/libc/net/nss_compat.c#2 integrate
.. //depot/projects/mips/lib/libc/net/res_send.c#2 integrate
.. //depot/projects/mips/lib/libc/posix1e/acl_delete_entry.c#2 integrate
.. //depot/projects/mips/lib/libc/posix1e/mac.c#6 integrate
.. //depot/projects/mips/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/fpu/fpu.c#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/gen/signalcontext.c#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#3 integrate
.. //depot/projects/mips/lib/libc/sparc64/sys/__sparc_utrap.c#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/sys/__sparc_utrap_install.c#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/sys/__sparc_utrap_setup.c#3 integrate
.. //depot/projects/mips/lib/libc/stdio/vfscanf.c#5 integrate
.. //depot/projects/mips/lib/libc/stdio/vfwprintf.c#9 integrate
.. //depot/projects/mips/lib/libc/stdio/vfwscanf.c#5 integrate
.. //depot/projects/mips/lib/libc/sys/ptrace.2#4 integrate
.. //depot/projects/mips/lib/libc_r/uthread/pthread_private.h#7 integrate
.. //depot/projects/mips/lib/libc_r/uthread/uthread_rwlock.c#3 integrate
.. //depot/projects/mips/lib/libio/alpha_sethae.c#2 integrate
.. //depot/projects/mips/lib/libpthread/thread/thr_create.c#7 integrate
.. //depot/projects/mips/lib/libpthread/thread/thr_private.h#10 integrate
.. //depot/projects/mips/lib/libpthread/thread/thr_rwlock.c#5 integrate
.. //depot/projects/mips/lib/libsdp/sdp-int.h#2 integrate
.. //depot/projects/mips/lib/libsdp/sdp.3#2 integrate
.. //depot/projects/mips/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/mips/lib/libsdp/search.c#2 integrate
.. //depot/projects/mips/lib/libsdp/session.c#2 integrate
.. //depot/projects/mips/lib/libsdp/util.c#3 integrate
.. //depot/projects/mips/libexec/ftpd/ftpd.c#10 integrate
.. //depot/projects/mips/release/doc/en_US.ISO8859-1/errata/article.sgml#13 integrate
.. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 integrate
.. //depot/projects/mips/sbin/Makefile#11 integrate
.. //depot/projects/mips/sbin/bsdlabel/Makefile#3 integrate
.. //depot/projects/mips/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/mips/sbin/mount/mount.c#6 integrate
.. //depot/projects/mips/sbin/mount_nullfs/mount_nullfs.8#4 integrate
.. //depot/projects/mips/secure/lib/libssh/Makefile#5 integrate
.. //depot/projects/mips/secure/libexec/sftp-server/Makefile#4 integrate
.. //depot/projects/mips/secure/libexec/ssh-keysign/Makefile#3 integrate
.. //depot/projects/mips/secure/usr.bin/scp/Makefile#3 integrate
.. //depot/projects/mips/secure/usr.bin/sftp/Makefile#3 integrate
.. //depot/projects/mips/secure/usr.bin/ssh-add/Makefile#3 integrate
.. //depot/projects/mips/secure/usr.bin/ssh-agent/Makefile#3 integrate
.. //depot/projects/mips/secure/usr.bin/ssh-keygen/Makefile#3 integrate
.. //depot/projects/mips/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/mips/secure/usr.bin/ssh/Makefile#6 integrate
.. //depot/projects/mips/secure/usr.sbin/sshd/Makefile#6 integrate
.. //depot/projects/mips/share/examples/scsi_target/scsi_cmds.c#4 integrate
.. //depot/projects/mips/share/examples/scsi_target/scsi_target.h#3 integrate
.. //depot/projects/mips/share/man/man4/Makefile#19 integrate
.. //depot/projects/mips/share/man/man4/acpi.4#8 integrate
.. //depot/projects/mips/share/man/man4/ath.4#3 integrate
.. //depot/projects/mips/share/man/man4/ath_hal.4#2 integrate
.. //depot/projects/mips/share/man/man4/aue.4#4 integrate
.. //depot/projects/mips/share/man/man4/gdb.4#2 integrate
.. //depot/projects/mips/share/man/man4/gx.4#3 integrate
.. //depot/projects/mips/share/man/man4/kue.4#4 integrate
.. //depot/projects/mips/share/man/man4/lge.4#2 integrate
.. //depot/projects/mips/share/man/man4/man4.i386/Makefile#8 integrate
.. //depot/projects/mips/share/man/man4/man4.i386/ndis.4#3 integrate
.. //depot/projects/mips/share/man/man4/miibus.4#7 integrate
.. //depot/projects/mips/share/man/man4/nge.4#2 integrate
.. //depot/projects/mips/share/man/man4/re.4#2 integrate
.. //depot/projects/mips/share/man/man4/rue.4#4 integrate
.. //depot/projects/mips/share/man/man4/sk.4#4 integrate
.. //depot/projects/mips/share/man/man8/diskless.8#5 integrate
.. //depot/projects/mips/share/man/man9/Makefile#12 integrate
.. //depot/projects/mips/share/man/man9/sbuf.9#3 integrate
.. //depot/projects/mips/share/mk/bsd.cpu.mk#6 integrate
.. //depot/projects/mips/share/mk/bsd.sys.mk#7 integrate
.. //depot/projects/mips/sys/alpha/alpha/mp_machdep.c#6 integrate
.. //depot/projects/mips/sys/alpha/include/sysarch.h#2 integrate
.. //depot/projects/mips/sys/amd64/include/profile.h#3 integrate
.. //depot/projects/mips/sys/amd64/include/sysarch.h#3 integrate
.. //depot/projects/mips/sys/amd64/isa/atpic.c#2 integrate
.. //depot/projects/mips/sys/boot/forth/beastie.4th#2 integrate
.. //depot/projects/mips/sys/boot/i386/boot0/Makefile#3 integrate
.. //depot/projects/mips/sys/boot/i386/boot0/boot0sio.s#2 integrate
.. //depot/projects/mips/sys/compat/ndis/kern_ndis.c#3 integrate
.. //depot/projects/mips/sys/compat/ndis/ndis_var.h#3 integrate
.. //depot/projects/mips/sys/compat/ndis/pe_var.h#2 integrate
.. //depot/projects/mips/sys/compat/ndis/subr_ndis.c#3 integrate
.. //depot/projects/mips/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/mips/sys/compat/ndis/subr_pe.c#3 integrate
.. //depot/projects/mips/sys/conf/majors#13 integrate
.. //depot/projects/mips/sys/conf/newvers.sh#7 integrate
.. //depot/projects/mips/sys/conf/options.i386#13 integrate
.. //depot/projects/mips/sys/conf/options.pc98#13 integrate
.. //depot/projects/mips/sys/dev/acpica/Osd/OsdTable.c#3 integrate
.. //depot/projects/mips/sys/dev/acpica/acpi.c#14 integrate
.. //depot/projects/mips/sys/dev/an/if_an.c#12 integrate
.. //depot/projects/mips/sys/dev/ata/ata-disk.c#13 integrate
.. //depot/projects/mips/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/mips/sys/dev/bge/if_bge.c#12 integrate
.. //depot/projects/mips/sys/dev/bge/if_bgereg.h#9 integrate
.. //depot/projects/mips/sys/dev/drm/drmP.h#6 integrate
.. //depot/projects/mips/sys/dev/drm/drm_bufs.h#6 integrate
.. //depot/projects/mips/sys/dev/drm/drm_drv.h#8 integrate
.. //depot/projects/mips/sys/dev/drm/drm_sysctl.h#5 integrate
.. //depot/projects/mips/sys/dev/drm/mga_dma.c#6 integrate
.. //depot/projects/mips/sys/dev/drm/mga_drv.h#5 integrate
.. //depot/projects/mips/sys/dev/drm/r128.h#4 integrate
.. //depot/projects/mips/sys/dev/drm/r128_cce.c#6 integrate
.. //depot/projects/mips/sys/dev/drm/r128_drv.h#5 integrate
.. //depot/projects/mips/sys/dev/drm/radeon.h#6 integrate
.. //depot/projects/mips/sys/dev/drm/radeon_cp.c#6 integrate
.. //depot/projects/mips/sys/dev/drm/radeon_drv.h#6 integrate
.. //depot/projects/mips/sys/dev/firewire/firewire.c#18 integrate
.. //depot/projects/mips/sys/dev/firewire/firewirereg.h#12 integrate
.. //depot/projects/mips/sys/dev/firewire/fwmem.c#10 integrate
.. //depot/projects/mips/sys/dev/firewire/fwohci.c#17 integrate
.. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#14 integrate
.. //depot/projects/mips/sys/dev/firewire/fwohcireg.h#7 integrate
.. //depot/projects/mips/sys/dev/firewire/fwohcivar.h#6 integrate
.. //depot/projects/mips/sys/dev/firewire/if_fwe.c#13 integrate
.. //depot/projects/mips/sys/dev/firewire/sbp.c#16 integrate
.. //depot/projects/mips/sys/dev/ic/i8259.h#1 branch
.. //depot/projects/mips/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/mips/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/mips/sys/dev/pci/pci_pci.c#7 integrate
.. //depot/projects/mips/sys/dev/pci/pci_user.c#6 integrate
.. //depot/projects/mips/sys/dev/pci/pcib_private.h#5 integrate
.. //depot/projects/mips/sys/dev/sound/pci/emu10k1.c#7 integrate
.. //depot/projects/mips/sys/dev/trm/trm.c#8 integrate
.. //depot/projects/mips/sys/dev/usb/usbdevs#15 integrate
.. //depot/projects/mips/sys/dev/usb/usbdevs.h#14 integrate
.. //depot/projects/mips/sys/dev/usb/usbdevs_data.h#14 integrate
.. //depot/projects/mips/sys/fs/procfs/procfs.c#5 integrate
.. //depot/projects/mips/sys/fs/smbfs/smbfs_vnops.c#9 integrate
.. //depot/projects/mips/sys/geom/geom_subr.c#17 integrate
.. //depot/projects/mips/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate
.. //depot/projects/mips/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/mips/sys/gnu/dev/sound/pci/emu10k1.h#3 integrate
.. //depot/projects/mips/sys/i386/i386/elan-mmcr.c#8 integrate
.. //depot/projects/mips/sys/i386/i386/pmap.c#19 integrate
.. //depot/projects/mips/sys/i386/i386/vm_machdep.c#16 integrate
.. //depot/projects/mips/sys/i386/include/elan_mmcr.h#1 branch
.. //depot/projects/mips/sys/i386/include/md_var.h#7 integrate
.. //depot/projects/mips/sys/i386/include/profile.h#3 integrate
.. //depot/projects/mips/sys/i386/include/sysarch.h#3 integrate
.. //depot/projects/mips/sys/i386/isa/atpic.c#3 integrate
.. //depot/projects/mips/sys/i386/isa/icu.h#4 integrate
.. //depot/projects/mips/sys/i386/isa/pcvt/pcvt_ext.c#3 integrate
.. //depot/projects/mips/sys/ia64/include/sysarch.h#3 integrate
.. //depot/projects/mips/sys/kern/kern_descrip.c#15 integrate
.. //depot/projects/mips/sys/kern/kern_fork.c#19 integrate
.. //depot/projects/mips/sys/kern/kern_lock.c#10 integrate
.. //depot/projects/mips/sys/kern/kern_mutex.c#11 integrate
.. //depot/projects/mips/sys/kern/kern_sig.c#16 integrate
.. //depot/projects/mips/sys/kern/kern_thread.c#20 integrate
.. //depot/projects/mips/sys/kern/tty.c#12 integrate
.. //depot/projects/mips/sys/kern/uipc_syscalls.c#13 integrate
.. //depot/projects/mips/sys/kern/vfs_subr.c#16 integrate
.. //depot/projects/mips/sys/modules/Makefile#18 integrate
.. //depot/projects/mips/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/mips/sys/modules/ida/Makefile#1 branch
.. //depot/projects/mips/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/mips/sys/modules/sound/driver/emu10k1/Makefile#3 integrate
.. //depot/projects/mips/sys/net/if_atmsubr.c#9 integrate
.. //depot/projects/mips/sys/net/route.c#9 integrate
.. //depot/projects/mips/sys/netgraph/ng_ether.c#6 integrate
.. //depot/projects/mips/sys/netinet/ip_icmp.c#9 integrate
.. //depot/projects/mips/sys/netinet/ip_output.c#16 integrate
.. //depot/projects/mips/sys/netinet/tcp.h#2 integrate
.. //depot/projects/mips/sys/netinet/tcp_input.c#16 integrate
.. //depot/projects/mips/sys/netinet/tcp_subr.c#13 integrate
.. //depot/projects/mips/sys/netinet/tcp_usrreq.c#7 integrate
.. //depot/projects/mips/sys/netinet/tcp_var.h#9 integrate
.. //depot/projects/mips/sys/netinet6/in6.c#6 integrate
.. //depot/projects/mips/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/mips/sys/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/mips/sys/pc98/conf/NOTES#9 integrate
.. //depot/projects/mips/sys/pc98/i386/machdep.c#18 integrate
.. //depot/projects/mips/sys/pci/if_dc.c#16 integrate
.. //depot/projects/mips/sys/pci/if_dcreg.h#8 integrate
.. //depot/projects/mips/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/mips/sys/sparc64/include/ofw_machdep.h#3 integrate
.. //depot/projects/mips/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/mips/sys/sparc64/sparc64/ofw_machdep.c#4 integrate
.. //depot/projects/mips/sys/sys/filedesc.h#6 integrate
.. //depot/projects/mips/sys/sys/vnode.h#12 integrate
.. //depot/projects/mips/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/mips/sys/vm/vm_extern.h#5 integrate
.. //depot/projects/mips/sys/vm/vm_kern.c#7 integrate
.. //depot/projects/mips/sys/vm/vm_page.c#19 integrate
.. //depot/projects/mips/tools/tools/pirtool/Makefile#1 branch
.. //depot/projects/mips/tools/tools/pirtool/pirtable.h#1 branch
.. //depot/projects/mips/tools/tools/pirtool/pirtool.c#1 branch
.. //depot/projects/mips/usr.bin/lex/flex.skl#2 integrate
.. //depot/projects/mips/usr.bin/lex/gen.c#2 integrate
.. //depot/projects/mips/usr.bin/make/var.c#8 integrate
.. //depot/projects/mips/usr.bin/su/su.c#10 integrate
.. //depot/projects/mips/usr.bin/truss/alpha-fbsd.c#4 integrate
.. //depot/projects/mips/usr.bin/truss/extern.h#4 integrate
.. //depot/projects/mips/usr.bin/truss/i386-fbsd.c#5 integrate
.. //depot/projects/mips/usr.bin/truss/i386-linux.c#4 integrate
.. //depot/projects/mips/usr.bin/truss/ia64-fbsd.c#6 integrate
.. //depot/projects/mips/usr.bin/truss/setup.c#3 integrate
.. //depot/projects/mips/usr.bin/truss/sparc64-fbsd.c#4 integrate
.. //depot/projects/mips/usr.bin/truss/syscalls.c#7 integrate
.. //depot/projects/mips/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate
.. //depot/projects/mips/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c#2 integrate
.. //depot/projects/mips/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate
.. //depot/projects/mips/usr.sbin/fdformat/fdformat.c#2 integrate
.. //depot/projects/mips/usr.sbin/moused/moused.c#4 integrate
.. //depot/projects/mips/usr.sbin/mtree/create.c#5 integrate
.. //depot/projects/mips/usr.sbin/ndp/ndp.c#4 integrate
.. //depot/projects/mips/usr.sbin/nfsd/nfsd.c#2 integrate
.. //depot/projects/mips/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/mips/usr.sbin/ngctl/dot.c#1 branch
.. //depot/projects/mips/usr.sbin/ngctl/main.c#4 integrate
.. //depot/projects/mips/usr.sbin/ngctl/ngctl.8#3 integrate
.. //depot/projects/mips/usr.sbin/ngctl/ngctl.h#2 integrate
.. //depot/projects/mips/usr.sbin/pciconf/pciconf.8#4 integrate

Differences ...

==== //depot/projects/mips/bin/date/date.1#3 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/date/date.1,v 1.60 2003/02/23 01:47:47 ru Exp $
+.\" $FreeBSD: src/bin/date/date.1,v 1.61 2004/01/06 19:01:34 obrien Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -316,6 +316,7 @@
 .Pp
 may be used on one machine to print out the date
 suitable for setting on another.
+("+%m%d%H%M%Y.%S" for use on Linux)
 .Pp
 The command:
 .Pp

==== //depot/projects/mips/contrib/gcc/function.c#5 (text+ko) ====

@@ -19,6 +19,8 @@
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
+/* $FreeBSD: src/contrib/gcc/function.c,v 1.20 2004/01/06 10:38:48 bde Exp $ */
+
 /* This file handles the generation of rtl code from tree structure
    at the level of the function as a whole.
    It creates the rtl expressions for parameters and auto variables
@@ -6995,6 +6997,21 @@
 			 Pmode);
     }
 
+#ifdef TARGET_PROFILER_EPILOGUE
+  if (current_function_profile && TARGET_PROFILER_EPILOGUE)
+    {
+      static rtx mexitcount_libfunc;
+      static int initialized;
+
+      if (!initialized)
+	{
+	  mexitcount_libfunc = init_one_libfunc (".mexitcount");
+	  initialized = 1;
+	}
+      emit_library_call (mexitcount_libfunc, LCT_NORMAL, VOIDmode, 0);
+    }
+#endif
+
   /* Let except.c know where it should emit the call to unregister
      the function context for sjlj exceptions.  */
   if (flag_exceptions && USING_SJLJ_EXCEPTIONS)

==== //depot/projects/mips/crypto/openssh/CREDITS#3 (text+ko) ====

@@ -5,7 +5,7 @@
 
 Alain St-Denis <Alain.St-Denis@ec.gc.ca> - Irix fix
 Alexandre Oliva <oliva@lsd.ic.unicamp.br> - AIX fixes
-Andre Lucas <andre.lucas@dial.pipex.com> - new login code, many fixes
+Andre Lucas <andre@ae-35.com> - new login code, many fixes
 Andreas Steinmetz <ast@domdv.de> - Shadow password expiry support
 Andrew McGill <andrewm@datrix.co.za> - SCO fixes
 Andrew Morgan <morgan@transmeta.com> - PAM bugfixes
@@ -23,7 +23,7 @@
 Chris, the Young One <cky@pobox.com> - Password auth fixes
 Christos Zoulas <christos@zoulas.com> - Autoconf fixes
 Chun-Chung Chen <cjj@u.washington.edu> - RPM fixes
-Corinna Vinschen <vinschen@cygnus.com> - Cygwin support
+Corinna Vinschen <vinschen@redhat.com> - Cygwin support
 Dan Brosemer <odin@linuxfreak.com> - Autoconf support, build fixes
 Darren Hall <dhall@virage.org> - AIX patches
 Darren Tucker <dtucker@zip.com.au> - AIX BFF package scripts
@@ -49,6 +49,7 @@
 KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> - Configure fixes
 Kees Cook <cook@cpoint.net> - scp fixes
 Kenji Miyake <kenji@miyake.org> - Configure fixes
+Kevin Cawlfield <cawlfiel@us.ibm.com> - AIX fixes.
 Kevin O'Connor <kevin_oconnor@standardandpoors.com> - RSAless operation
 Kevin Steves <stevesk@pobox.com> - HP support, bugfixes, improvements
 Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes
@@ -69,11 +70,13 @@
 Pavel Troller <patrol@omni.sinus.cz> - Bugfixes
 Pekka Savola <pekkas@netcore.fi> - Bugfixes
 Peter Kocks <peter.kocks@baygate.com> - Makefile fixes
+Peter Stuge <stuge@cdy.org> - mdoc2man.awk script
 Phil Hands <phil@hands.com> - Debian scripts, assorted patches
 Phil Karn <karn@ka9q.ampr.org> - Autoconf fixes
 Philippe WILLEM <Philippe.WILLEM@urssaf.fr> - Bugfixes
 Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix
 Rip Loomis <loomisg@cist.saic.com> - Solaris package support, fixes
+Roumen Petrov <openssh@roumenpetrov.info> - Compile & configure fixes
 SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes
 Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes, Compat with MIT KrbV
 Solar Designer <solar@openwall.com> - many patches and technical assistance
@@ -91,5 +94,5 @@
 
 Damien Miller <djm@mindrot.org>
 
-$Id: CREDITS,v 1.67 2002/07/28 20:31:19 stevesk Exp $
+$Id: CREDITS,v 1.74 2003/09/07 02:34:54 dtucker Exp $
 

==== //depot/projects/mips/crypto/openssh/ChangeLog#4 (text+ko) ====

@@ -1,1298 +1,1191 @@
-20030401
- - (djm) OpenBSD CVS Sync
-   - jmc@cvs.openbsd.org 2003/03/28 10:11:43
-     [scp.1 sftp.1 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5 sshd_config.5]
-     [ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8]
-     - killed whitespace
-     - new sentence new line
-     - .Bk for arguments
-     ok markus@
-   - markus@cvs.openbsd.org 2003/04/01 10:10:23
-     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
-     [readconf.h serverloop.c sshconnect2.c]
-     rekeying bugfixes and automatic rekeying:
-     * both client and server rekey _automatically_
-           (a) after 2^31 packets, because after 2^32 packets
-               the sequence number for packets wraps
-           (b) after 2^(blocksize_in_bits/4) blocks
-       (see: draft-ietf-secsh-newmodes-00.txt)
-       (a) and (b) are _enabled_ by default, and only disabled for known
-       openssh versions, that don't support rekeying properly.
-     * client option 'RekeyLimit'
-     * do not reply to requests during rekeying
-   - markus@cvs.openbsd.org 2003/04/01 10:22:21
-     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
-     [readconf.h serverloop.c sshconnect2.c]
-     backout rekeying changes (for 3.6.1)
-   - markus@cvs.openbsd.org 2003/04/01 10:31:26
-     [compat.c compat.h kex.c]
-     bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@; 
-     tested by ho@ and myself
-   - markus@cvs.openbsd.org 2003/04/01 10:56:46
-     [version.h]
-     3.6.1
- - (djm) Crank spec file versions
- - (djm) Release 3.6.1p1
+20030923
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2003/09/18 07:52:54
+     [sshconnect.c]
+     missing {}; bug #656; jclonguet at free.fr
+   - markus@cvs.openbsd.org 2003/09/18 07:54:48
+     [buffer.c]
+     protect against double free; #660;  zardoz at users.sf.net
+   - markus@cvs.openbsd.org 2003/09/18 08:49:45
+     [deattack.c misc.c session.c ssh-agent.c]
+     more buffer allocation fixes; from Solar Designer; CAN-2003-0682;
+     ok millert@
+   - markus@cvs.openbsd.org 2003/09/19 09:02:02
+     [packet.c]
+     buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471
+ - (djm) Fix SSH1 challenge kludge
+ - (djm) Bug #671: Fix builds on OpenBSD
+ - (djm) Bug #676: Fix PAM stack corruption
+ - (djm) Fix bad free() in PAM code
+ - (djm) Don't call pam_end before pam_init
+ - (djm) Enable build with old OpenSSL again
+ - (djm) Trim deprecated options from INSTALL. Mention UsePAM
+ - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
+ - (djm) Crank version.h and spec version numbers
+ - (djm) Release 3.7.1p2
 
-20030326
- - (djm) OpenBSD CVS Sync
-   - deraadt@cvs.openbsd.org 2003/03/26 04:02:51
-     [sftp-server.c]
-     one last fix to the tree: race fix broke stuff; pr 3169; 
-     srp@srparish.net, help from djm
+20030922
+ - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree
+   builds.  Portability corrections from tim@.
+ - (dtucker) [configure.ac] Bug #665: uid swapping issues on Mac OS X.
+   Patch from max at quendi.de.
+ - (dtucker) [configure.ac] Bug #657: uid swapping issues on BSDi.
+ - (dtucker) [configure.ac] Bug #653: uid swapping issues on Tru64.
+ - (dtucker) [configure.ac] Bug #693: uid swapping issues on NCR MP-RAS.
+   Patch from david.haughton at ncr.com
+ - (dtucker) [configure.ac] Bug #659: uid swapping issues on IRIX 6.
+   Part of patch supplied by bugzilla-openssh at thewrittenword.com
+ - (dtucker) [configure.ac openbsd-compat/fake-rfc2553.c
+   openbsd-compat/fake-rfc2553.h] Bug #659: Test for and handle systems with
+   where gai_strerror is defined as "const char *".  Part of patch supplied
+   by bugzilla-openssh at thewrittenword.com
+ - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config] Update
+   ssh-host-config to match current defaults, bump README version.  Patch from
+   vinschen at redhat.com.
+ - (dtucker) [uidswap.c] Don't test restoration of uid on Cygwin since the
+   OS does not support permanently dropping privileges.  Patch from
+   vinschen at redhat.com.
+ - (dtucker) [openbsd-compat/port-aix.c] Use correct include for xmalloc.h,
+   add canohost.h to stop warning.  Based on patch from openssh-unix-dev at
+   thewrittenword.com
+ - (dtucker) [INSTALL] Bug #686: Document requirement for zlib 1.1.4 or
+   higher.
+ - (tim) Fix typo. s/SETEIUD_BREAKS_SETUID/SETEUID_BREAKS_SETUID/
+ - (tim) [configure.ac] Bug 665: move 3 new AC_DEFINES outside of AC_TRY_RUN.
+   Report by distler AT golem ph utexas edu.
+ - (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from
+   article by genty at austin.ibm.com, included with the author's permission.
+ - (tim) [configure.ac] add --disable-etc-default-login option. ok djm
 
-20030325
- - (djm) Fix getpeerid support for 64 bit BE systems. From 
-    Arnd Bergmann <arndb@de.ibm.com>
+20030919
+ - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
+   djast AT cs.toronto.edu
+ - (djm) Bug #680: Remove missing inet_ntoa.h header reference
+ - (djm) Bug #646: Fix location of x11-ssh-askpass; Jim
+ - (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h
+   unless required.  Reorder to reduce warnings.
+ - (dtucker) [session.c] Bug #643: Fix size_t -> u_int and fix null deref
+   when /etc/default/login doesn't exist or isn't readable.  Fixes from
+   jparsons-lists at saffron.net and georg.oppenberg at deu mci com.
 
-20030324
- - (djm) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/03/23 19:02:00
-     [monitor.c]
-     unbreak rekeying for privsep; ok millert@
- - Release 3.6p1
- - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
-   Report from murple@murple.net, diagnosis from dtucker@zip.com.au
+20030918
+ - (djm) Bug #652: Fix empty password auth
 
-20030320
- - (djm) OpenBSD CVS Sync
-   - markus@cvs.openbsd.org 2003/03/17 10:38:38
-     [progressmeter.c]
-     don't print \n if backgrounded; from ho@
-   - markus@cvs.openbsd.org 2003/03/17 11:43:47
-     [version.h]
-     enter 3.6
- - (bal) The days of lack of int64_t support are over.  Sorry kids.
- - (bal) scp.c 'limit' conflicts with Cray.  Rename to 'limitbw'
- - (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved
-   guessing rules)
- - (bal) Disable Privsep for Tru64 after pre-authentication due to issues
-   with SIA.  Also, clean up of tru64 support patch by Chris Adams
-   <cmadams@hiwaay.net>
- - (tim) [contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files
+20030917
+ - (djm) OpenBSD Sync
+   - markus@cvs.openbsd.org 2003/09/16 21:02:40
+     [buffer.c channels.c version.h]
+     more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU
+ - (djm) Crank RPM spec versions
+ - (djm) Release 3.7.1p1
 
-20030318
- - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
-   add nanosleep(). testing/corrections by Darren Tucker <dtucker@zip.com.au>
+20030916
+ - (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve
+   PATH (or SUPATH) and UMASK from /etc/default/login on platforms that have it

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 03:26:34 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3857C16A4D1; Sun, 11 Jan 2004 03:26:34 -0800 (PST)
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 143D616A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 03:26:34 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3F44A43D41
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 03:26:33 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BBQX0B050775
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 03:26:33 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BBQW5W050772
	for perforce@freebsd.org; Sun, 11 Jan 2004 03:26:32 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 03:26:32 -0800 (PST)
Message-Id: <200401111126.i0BBQW5W050772@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45136 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: Sun, 11 Jan 2004 11:26:34 -0000

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

Change 45136 by jmallett@jmallett_oingo on 2004/01/11 03:25:42

	It looks like -O is OK now.

Affected files ...

.. //depot/projects/mips/sys/conf/kern.pre.mk#8 edit

Differences ...

==== //depot/projects/mips/sys/conf/kern.pre.mk#8 (text+ko) ====

@@ -16,9 +16,6 @@
 OBJCOPY?=	objcopy
 SIZE?=		size
 
-.if defined(ARCH) && ${ARCH} != "mips"
-COPTFLAGS?=-O -pipe
-.endif
 .if !defined(NO_CPU_COPTFLAGS)
 COPTFLAGS+= ${_CPUCFLAGS}
 .endif

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 04:01:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5579616A4D2; Sun, 11 Jan 2004 04:01:17 -0800 (PST)
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 2514A16A4D0
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 04:01:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6566443D39
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 04:01:16 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BC1G0B057477
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 04:01:16 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BC1GQ0057474
	for perforce@freebsd.org; Sun, 11 Jan 2004 04:01:16 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 04:01:16 -0800 (PST)
Message-Id: <200401111201.i0BC1GQ0057474@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45138 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: Sun, 11 Jan 2004 12:01:18 -0000

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

Change 45138 by jmallett@jmallett_oingo on 2004/01/11 04:01:05

	sysinit stuff if bootverbose.

Affected files ...

.. //depot/projects/mips/sys/kern/init_main.c#14 edit

Differences ...

==== //depot/projects/mips/sys/kern/init_main.c#14 (text+ko) ====

@@ -209,8 +209,9 @@
 		if ((*sipp)->subsystem == SI_SUB_DONE)
 			continue;
 
-		printf("SYSINIT[%8x] = %p:%p\n", (*sipp)->subsystem,
-		       sipp, *sipp);
+		if (bootverbose)
+			printf("SYSINIT[%8x] = %p:%p\n", (*sipp)->subsystem,
+			       sipp, *sipp);
 
 		/* Call function */
 		(*((*sipp)->func))((*sipp)->udata);

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 04:02:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C08F316A4D2; Sun, 11 Jan 2004 04:02:20 -0800 (PST)
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 1395816A4D0
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 04:02:19 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 40AF843D53
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 04:02:18 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BC2I0B058873
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 04:02:18 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BC2H1B058867
	for perforce@freebsd.org; Sun, 11 Jan 2004 04:02:17 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 04:02:17 -0800 (PST)
Message-Id: <200401111202.i0BC2H1B058867@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45139 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: Sun, 11 Jan 2004 12:02:25 -0000

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

Change 45139 by jmallett@jmallett_oingo on 2004/01/11 04:01:45

	I can't be bothered fixing INET-without-INET6 in the main tree,
	and this isn't the place to do it, so add INET6 now that -O is
	on.

Affected files ...

.. //depot/projects/mips/sys/mips/conf/INDY#5 edit

Differences ...

==== //depot/projects/mips/sys/mips/conf/INDY#5 (text+ko) ====

@@ -29,6 +29,7 @@
 
 options 	FFS
 options 	INET
+options 	INET6
 device		ether
 device		loop
 

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 10:49:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3572D16A4D1; Sun, 11 Jan 2004 10:49:17 -0800 (PST)
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 099E516A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 10:49:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 99E0B43D49
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 10:49:15 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BInF0B059991
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 10:49:15 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BInEhl059986
	for perforce@freebsd.org; Sun, 11 Jan 2004 10:49:14 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 10:49:14 -0800 (PST)
Message-Id: <200401111849.i0BInEhl059986@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45150 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: Sun, 11 Jan 2004 18:49:17 -0000

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

Change 45150 by rwatson@rwatson_paprika on 2004/01/11 10:46:39

	Each active thread carries around its in-progress audit record
	in its thread structure.  Equivilent to uthread->uu_ar in
	Darwin.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/sys/proc.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/sys/proc.h#2 (text+ko) ====

@@ -253,6 +253,7 @@
  * with N runnable and queued KSEs in the KSEGRP, the first N threads
  * are linked to them. Other threads are not yet assigned.
  */
+struct kaudit_record;
 struct thread {
 	struct proc	*td_proc;	/* (*) Associated process. */
 	struct ksegrp	*td_ksegrp;	/* (*) Associated KSEG. */
@@ -302,6 +303,7 @@
 	sigset_t	*td_waitset;	/* (c) Wait set for sigwait. */
 	TAILQ_ENTRY(thread) td_umtx;	/* (c?) Link for when we're blocked. */
 	volatile u_int	td_generation;	/* (k) Enable detection of preemption */
+	struct kaudit_record	*td_ar;	/* (k) Active audit record, if any. */
 
 #define	td_endzero td_base_pri
 

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 11:07:42 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D752816A4D1; Sun, 11 Jan 2004 11:07:41 -0800 (PST)
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 9A8EB16A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:07:41 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 04D8D43D39
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:07:40 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BJ7d0B065048
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:07:39 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BJ7dZT065045
	for perforce@freebsd.org; Sun, 11 Jan 2004 11:07:39 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 11:07:39 -0800 (PST)
Message-Id: <200401111907.i0BJ7dZT065045@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45153 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: Sun, 11 Jan 2004 19:07:42 -0000

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

Change 45153 by rwatson@rwatson_paprika on 2004/01/11 11:07:17

	Synchronize system call argument names with Darwin; gratuitous
	differences considered bad.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#3 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#3 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#3 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#3 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#3 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#3 (text+ko) ====

@@ -639,17 +639,17 @@
 			    int attrnamespace, void *data, size_t nbytes); }
 439	STD	BSD	{ ssize_t extattr_list_link(const char *path, \
 			    int attrnamespace, void *data, size_t nbytes); }
-440	MSTD	BSD	{ int audit(const void *ar, int len); }
-441	MSTD	BSD	{ int auditon(int cmd, void *data, int len); }
+440	MSTD	BSD	{ int audit(const void *record, int length); }
+441	MSTD	BSD	{ int auditon(int cmd, void *data, int length); }
 442	MSTD	BSD	{ int auditsvc(int fd, int limit); }
 443	MSTD	BSD	{ int getauid(uid_t *auid); }
 444	MSTD	BSD	{ int setauid(uid_t *auid); }
 445	MSTD	BSD	{ int getaudit(struct auditinfo *auditinfo); }
 446	MSTD	BSD	{ int setaudit(struct auditinfo *auditinfo); }
 447	MSTD	BSD	{ int getaudit_addr(struct auditinfo_addr \
-			    *auditinfo_addr, int len); }
+			    *auditinfo_addr, int length); }
 448	MSTD	BSD	{ int setaudit_addr(struct auditinfo_addr \
-			    *auditinfo_addr, int len); }
+			    *auditinfo_addr, int length); }
 449	MSTD	BSD	{ int auditctl(char *path); }
 
 ; Please copy any additions and changes to the following compatability tables:

==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#3 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#3 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#3 (text+ko) ====

@@ -1285,13 +1285,13 @@
 	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
 };
 struct audit_args {
-	char ar_l_[PADL_(const void *)]; const void * ar; char ar_r_[PADR_(const void *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
+	char record_l_[PADL_(const void *)]; const void * record; char record_r_[PADR_(const void *)];
+	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
 };
 struct auditon_args {
 	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
 	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
+	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
 };
 struct auditsvc_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@@ -1311,11 +1311,11 @@
 };
 struct getaudit_addr_args {
 	char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
+	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
 };
 struct setaudit_addr_args {
 	char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
+	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
 };
 struct auditctl_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 11:14:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 56F2016A4D1; Sun, 11 Jan 2004 11:14:03 -0800 (PST)
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 2C4C916A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:14:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E79BB43D2D
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:13:54 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BJDs0B066966
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:13:54 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BJDsI6066960
	for perforce@freebsd.org; Sun, 11 Jan 2004 11:13:54 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 11:13:54 -0800 (PST)
Message-Id: <200401111913.i0BJDsI6066960@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45154 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: Sun, 11 Jan 2004 19:14:03 -0000

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

Change 45154 by rwatson@rwatson_paprika on 2004/01/11 11:12:56

	More of the way to audit.c compiling:
	- Use FreeBSD kthreads, not Mach kthreads.
	- Namei include required.
	- UNIX domain socket include required.
	- Get rid of temporary typedefing and just use FreeBSD mutexes and
	  cv's rather than the Mach mutex and waitqueue APIs, don't even
	  pretend about the funnels.  Amazing how much more simple the CV
	  API is.
	- Remove some undefined variables picked up by FreeBSD use of -Wall.
	- Comment out the system call table bits -- we'll want to add audit
	  record types to syscalls.master, probably.
	- Use td->td_ucred rather than p->p_cred->pc_ucred.
	- Use FreeBSD suser() API.
	- Don't declare system call argument structures here, that's done
	  for us by virtue of syscalls.master magic.
	- Use threads instead of processes in VFS situations.
	- Use struct thread instead of struct uthread; td instead of uu.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#6 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#4 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#6 (text+ko) ====

@@ -29,6 +29,8 @@
 #include <sys/condvar.h>
 #include <sys/fcntl.h>
 #include <sys/ipc.h>
+#include <sys/kthread.h>
+#include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
@@ -36,14 +38,12 @@
 #include <sys/systm.h>
 #include <sys/ucred.h>
 #include <sys/uio.h>
+#include <sys/un.h>
 #include <sys/vnode.h>
 
 #include <security/audit/kern_audit.h>
 #include <security/audit/bsm_klib.h>
 
-typedef struct mutex mutex_t;
-typedef struct cv wait_queue_t;
-
 #define	kmem_alloc(map, ptrref, size)
 #define	kmem_free(map, ptr, size)
 
@@ -51,9 +51,6 @@
 	vn_rdwr((rw), (vp), (base), (len), (offset), (segflg), (ioflg), \
 	    (cred), NULL, (resid), (td))
 
-#define	mutex_lock(x)	mtx_lock(x)
-#define	mutex_unlock(x)	mtx_unlock(x)
-
 #ifdef AUDIT
 
 /*
@@ -92,7 +89,7 @@
  * Mutex to protect global variables shared between various threads and
  * processes.
  */
-static mutex_t				*audit_mtx;
+static struct mtx			 audit_mtx;
 
 /*
  * Queue of audit records ready for delivery to disk.  We insert new
@@ -105,7 +102,12 @@
  * either new records are in the queue, or a log replacement is taking
  * place.
  */
-static wait_queue_t			 audit_wait_queue;
+static struct cv			 audit_cv;
+
+/*
+ * Worker thread that will schedule disk I/O, etc.
+ */
+static struct proc			 *audit_thread;
 
 /*
  * When an audit log is rotated, the actual rotation must be performed
@@ -121,7 +123,7 @@
  * by the worker thread so a waiting thread can start another replacement.
  * We also store a credential to perform audit log write operations with.
  */
-static wait_queue_t			 audit_replacement_wait_queue;
+static struct cv			 audit_replacement_cv;
 
 static int				 audit_replacement_flag;
 static struct vnode			*audit_replacement_vp;
@@ -133,12 +135,6 @@
 const static int		 audit_open_flags = FWRITE | O_APPEND;
 const static int		 audit_close_flags = FWRITE | O_APPEND;
 
-/*
- * XXX: Couldn't find the include file for this, so copied kern_exec.c's
- * behavior.
- */
-// extern task_t kernel_task;
-
 static void
 audit_free(struct kaudit_record *ar)
 {
@@ -213,11 +209,11 @@
 }
 
 static void
-audit_worker(void)
+audit_worker(void *arg)
 {
 	int do_replacement_signal, error, release_funnel;
 	TAILQ_HEAD(, kaudit_record) ar_worklist;
-	struct kaudit_record *ar, *ar_start, *ar_stop;
+	struct kaudit_record *ar;
 	struct vnode *audit_vp, *old_vp;
 	struct ucred *audit_cred, *old_cred;
 	struct thread *audit_td;
@@ -237,7 +233,7 @@
 	thread_funnel_set(kernel_flock, FALSE);
 #endif
 
-	mutex_lock(audit_mtx);
+	mtx_lock(&audit_mtx);
 	while (1) {
 		/*
 		 * First priority: replace the audit log target if requested.
@@ -263,12 +259,8 @@
 			audit_enabled = (audit_vp != NULL);
 
 			if (old_vp != NULL || audit_vp != NULL) {
-				mutex_unlock(audit_mtx);
-#ifdef DARWIN_FOO
-				thread_funnel_set(kernel_flock, TRUE);
-#else
+				mtx_unlock(&audit_mtx);
 				mtx_lock(&Giant);
-#endif
 				release_funnel = 1;
 			} else
 				release_funnel = 0;
@@ -288,12 +280,8 @@
 				AUDIT_PRINTF(("Opening new audit file\n"));
 			}
 			if (release_funnel) {
-#ifdef DARWIN_FOO
-				thread_funnel_set(kernel_flock, FALSE);
-#else
 				mtx_unlock(&Giant);
-#endif
-				mutex_lock(audit_mtx);
+				mtx_lock(&audit_mtx);
 			}
 			do_replacement_signal = 1;
 		}
@@ -306,29 +294,18 @@
 		 * successfully.
 		 */
 		if (do_replacement_signal)
-			wait_queue_wakeup_all(audit_replacement_wait_queue,
-			    0, THREAD_AWAKENED);
+			cv_broadcast(&audit_replacement_cv);
 
 		/*
 		 * Next, check to see if we have any records to drain into
 		 * the vnode.  If not, go back to waiting for an event.
 		 */
 		if (TAILQ_EMPTY(&audit_q)) {
-			int ret;
-
 			AUDIT_PRINTF(("audit_worker waiting\n"));
-			ret = wait_queue_assert_wait(audit_wait_queue, 0, 
-			                             THREAD_UNINT);
-			mutex_unlock(audit_mtx);
-
-			assert(ret == THREAD_WAITING);
-			ret = thread_block(THREAD_CONTINUE_NULL);
-			assert(ret == THREAD_AWAKENED);
+			cv_wait(&audit_cv, &audit_mtx);
 			AUDIT_PRINTF(("audit_worker woken up\n"));
 	AUDIT_PRINTF(("audit_worker: new vp = %p; value of flag %d\n",
 	    audit_replacement_vp, audit_replacement_flag));
-
-			mutex_lock(audit_mtx);
 			continue;
 		}
 
@@ -350,12 +327,12 @@
 				TAILQ_REMOVE(&audit_q, ar, k_q);
 				TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q);
 			}
-			mutex_unlock(audit_mtx);
+			mtx_unlock(&audit_mtx);
 			while ((ar = TAILQ_FIRST(&ar_worklist))) {
 				TAILQ_REMOVE(&ar_worklist, ar, k_q);
 				audit_free(ar);
 			}
-			mutex_lock(audit_mtx);
+			mtx_lock(&audit_mtx);
 			continue;
 		}
 
@@ -375,7 +352,7 @@
 			TAILQ_REMOVE(&audit_q, ar, k_q);
 			TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q);
 		}
-		mutex_unlock(audit_mtx);
+		mtx_unlock(&audit_mtx);
 		release_funnel = 0;
 		while ((ar = TAILQ_FIRST(&ar_worklist))) {
 			TAILQ_REMOVE(&ar_worklist, ar, k_q);
@@ -403,27 +380,26 @@
 			audit_free(ar);
 		}
 		if (release_funnel)
-#ifdef DARWIN_FOO
-			thread_funnel_set(kernel_flock, FALSE);
-#else
 			mtx_unlock(&Giant);
-#endif
-		mutex_lock(audit_mtx);
+		mtx_lock(&audit_mtx);
 	}
 }
 
 void
 audit_init(void)
 {
+	int error;
 
 	/* Verify that the syscall to audit event table is the same
 	 * size as the system call table.
 	 */
+#ifdef DARWIN_FOO
 	if (nsys_au_event != nsysent) {
 		printf("Security auditing service initialization failed, ");
 		printf("audit event table doesn't match syscall table.\n");
 		return;
 	}
+#endif
 
 	printf("Security auditing service present\n");
 	TAILQ_INIT(&audit_q);
@@ -432,41 +408,34 @@
 	audit_replacement_cred = NULL;
 	audit_replacement_flag = 0;
 	audit_replacement_vp = NULL;
-	audit_mtx = mutex_alloc(ETAP_NO_TRACE);
-	audit_wait_queue = wait_queue_alloc(SYNC_POLICY_FIFO);
-	audit_replacement_wait_queue = wait_queue_alloc(SYNC_POLICY_FIFO);
+	mtx_init(&audit_mtx, "audit_mtx", NULL, MTX_DEF);
+	cv_init(&audit_cv, "audit_cv");
+	cv_init(&audit_replacement_cv, "audit_replacement_cv");
 
 	/* Initialize the BSM audit subsystem. */
 	kau_init();
 
-	kernel_thread(kernel_task, audit_worker);
+	error = kthread_create(audit_worker, NULL, &audit_thread, 0, 0,
+	    "audit_worker");
+	if (error != 0)
+		panic("audit_init: kthread_create returned %d", error);
 }
 
 static void
 audit_rotate_vnode(struct ucred *cred, struct vnode *vp)
 {
-	int ret;
 
 	/*
 	 * If other parallel log replacements have been requested, we wait
 	 * until they've finished before continuing.
 	 */
-	mutex_lock(audit_mtx);
+	mtx_lock(&audit_mtx);
 	while (audit_replacement_flag != 0) {
-
 		AUDIT_PRINTF(("audit_rotate_vnode: sleeping to wait for "
 		    "flag\n"));
-		ret = wait_queue_assert_wait(audit_replacement_wait_queue, 0,
-		                             THREAD_UNINT);
-		mutex_unlock(audit_mtx);
-
-		assert(ret == THREAD_WAITING);
-		ret = thread_block(THREAD_CONTINUE_NULL);
-		assert(ret == THREAD_AWAKENED);
+		cv_wait(&audit_replacement_cv, &audit_mtx);
 		AUDIT_PRINTF(("audit_rotate_vnode: woken up (flag %d)\n",
 		    audit_replacement_flag));
-
-		mutex_lock(audit_mtx);
 	}
 	audit_replacement_cred = cred;
 	audit_replacement_flag = 1;
@@ -476,7 +445,7 @@
 	 * Wake up the audit worker to perform the exchange once we
 	 * release the mutex.
 	 */
-	wait_queue_wakeup_one(audit_wait_queue, 0, THREAD_AWAKENED);
+	cv_signal(&audit_cv);
 
 	/*
 	 * Wait for the audit_worker to broadcast that a replacement has
@@ -485,15 +454,10 @@
 	 */
 	AUDIT_PRINTF(("audit_rotate_vnode: waiting for news of "
 	    "replacement\n"));
-	ret = wait_queue_assert_wait(audit_replacement_wait_queue, 0,
-	                             THREAD_UNINT);
-	mutex_unlock(audit_mtx);
-
-	assert(ret == THREAD_WAITING);
-	ret = thread_block(THREAD_CONTINUE_NULL);
-	assert(ret == THREAD_AWAKENED);
+	cv_wait(&audit_replacement_cv, &audit_mtx);
 	AUDIT_PRINTF(("audit_rotate_vnode: change acknowledged by "
 	    "audit_worker (flag " "now %d)\n", audit_replacement_flag));
+	mtx_unlock(&audit_mtx);
 }
 
 /*
@@ -529,7 +493,6 @@
 int
 audit(struct thread *td, struct audit_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 	void * rec;
 	struct kaudit_record *ar;
@@ -542,7 +505,7 @@
 	if (ar == NULL)
 		return (ENOTSUP);
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 
@@ -579,19 +542,13 @@
 /*
  *  System call to manipulate auditing.
  */
-struct auditon_args {
-	int	cmd;
-	void *	data;
-	int	length;
-};
 /* ARGSUSED */
 int
 auditon(struct thread *td, struct auditon_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 	return (ENOSYS);
@@ -600,18 +557,13 @@
 /*
  *  System call to pass in file descriptor for audit log.
  */
-struct auditsvc_args {
-	int	fd;
-	int	limit;
-};
 /* ARGSUSED */
 int
 auditsvc(struct thread *td, struct auditsvc_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 	return (ENOSYS);
@@ -621,17 +573,13 @@
  * System calls to manage the user audit information.
  * XXXAUDIT May need to lock the proc structure.
  */
-struct getauid_args {
-	au_id_t	*auid;
-};
 /* ARGSUSED */
 int
 getauid(struct thread *td, struct getauid_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 
@@ -643,17 +591,13 @@
 	return (0);
 }
 
-struct setauid_args {
-	au_id_t	*auid;
-};
 /* ARGSUSED */
 int
 setauid(struct thread *td, struct setauid_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 
@@ -669,17 +613,13 @@
 /*
  *  System calls to get and set process audit information.
  */
-struct getaudit_args {
-	struct auditinfo	*auditinfo;
-};
 /* ARGSUSED */
 int
 getaudit(struct thread *td, struct getaudit_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 	error = copyout((void *)p->p_au, (void *)uap->auditinfo, 
@@ -690,17 +630,13 @@
 	return (0);
 }
 
-struct setaudit_args {
-	struct auditinfo	*auditinfo;
-};
 /* ARGSUSED */
 int
 setaudit(struct thread *td, struct setaudit_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 	error = copyin((void *)uap->auditinfo, (void *)p->p_au, 
@@ -711,35 +647,25 @@
 	return (0);
 }
 
-struct getaudit_addr_args {
-	struct auditinfo_addr	*auditinfo_addr;
-	int			length;
-};
 /* ARGSUSED */
 int
 getaudit_addr(struct thread *td, struct getaudit_addr_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 	return (ENOSYS);
 }
 
-struct setaudit_addr_args {
-	struct auditinfo_addr	*auditinfo_addr;
-	int			length;
-};
 /* ARGSUSED */
 int
 setaudit_addr(struct thread *td, struct setaudit_addr_args *uap)
 {
-	register struct pcred *pc = p->p_cred;
 	int error;
 
-	error = suser(pc->pc_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 	return (ENOSYS);
@@ -750,20 +676,16 @@
  *
  * XXX: Should generate an audit event.
  */
-struct auditctl_args {
-	char	*path;
-};
 /* ARGSUSED */
 int
 auditctl(struct thread *td, struct auditctl_args *uap)
 {
-	struct kaudit_record *ar;
 	struct nameidata nd;
 	struct ucred *cred;
 	struct vnode *vp;
-	int error, flags, ret;
+	int error, flags;
 
-	error = suser(p->p_ucred, &p->p_acflag);
+	error = suser(td);
 	if (error)
 		return (error);
 
@@ -779,17 +701,17 @@
 		NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE,
 		    uap->path, p);
 		flags = audit_open_flags;
-		error = vn_open(&nd, flags, 0);
+		error = vn_open(&nd, &flags, 0, -1);
 		if (error)
 			goto out;
 		VOP_UNLOCK(nd.ni_vp, 0, p);
 		vp = nd.ni_vp;
 		if (vp->v_type != VREG) {
-			vn_close(vp, audit_close_flags, p->p_ucred, p);
+			vn_close(vp, audit_close_flags, td->td_ucred, p);
 			error = EINVAL;
 			goto out;
 		}
-		cred = p->p_ucred;
+		cred = td->td_ucred;
 		crhold(cred);
 	}
 
@@ -806,7 +728,7 @@
  * MPSAFE
  */
 struct kaudit_record *
-audit_new(int event, struct proc *p, struct uthread *uthread)
+audit_new(int event, struct proc *p, struct thread *td)
 {
 	struct kaudit_record *ar;
 	int no_record;
@@ -822,9 +744,9 @@
 #if 0
 	if (event != AUDIT_EVENT_FILESTOP && event != AUDIT_EVENT_FILESTART) {
 #endif
-		mutex_lock(audit_mtx);
+		mtx_lock(&audit_mtx);
 		no_record = (audit_suspended || !audit_enabled);
-		mutex_unlock(audit_mtx);
+		mtx_unlock(&audit_mtx);
 		if (no_record)
 			return (NULL);
 #if 0
@@ -858,11 +780,11 @@
 
 	/* Export the subject credential. */
 	cru2x(p->p_ucred, &ar->k_ar.ar_subj_cred);
-	ar->k_ar.ar_subj_ruid = p->p_cred->p_ruid;
-	ar->k_ar.ar_subj_rgid = p->p_cred->p_rgid;
-	ar->k_ar.ar_subj_egid = p->p_ucred->cr_groups[0];
+	ar->k_ar.ar_subj_ruid = td->td_ucred->cr_ruid;
+	ar->k_ar.ar_subj_rgid = td->td_ucred->cr_rgid;
+	ar->k_ar.ar_subj_egid = td->td_ucred->cr_groups[0];
 	ar->k_ar.ar_subj_auid = p->p_au->ai_auid;
-	ar->k_ar.ar_subj_pid = p->p_pid;
+	ar->k_ar.ar_subj_pid = td->td_proc->p_pid;
 	bcopy(p->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN);
 	bcopy(&p->p_au->ai_mask, &ar->k_ar.ar_subj_amask, 
 			sizeof(p->p_au->ai_mask));
@@ -913,19 +835,19 @@
 	 * size bound (perhaps configurable), and if that bound is reached,
 	 * threads should sleep in audit_commit() until there's room.
 	 */
-	mutex_lock(audit_mtx);
+	mtx_lock(&audit_mtx);
 	/*
 	 * Note: it could be that some records initiated while audit was
 	 * enabled should still be committed?
 	 */
 	if (audit_suspended || !audit_enabled) {
-		mutex_unlock(audit_mtx);
+		mtx_unlock(&audit_mtx);
 		audit_free(ar);
 		return;
 	}
 	TAILQ_INSERT_TAIL(&audit_q, ar, k_q);
-	wait_queue_wakeup_one(audit_wait_queue, 0, THREAD_AWAKENED);
-	mutex_unlock(audit_mtx);
+	cv_signal(&audit_cv);
+	mtx_unlock(&audit_mtx);
 }
 
 /*
@@ -934,11 +856,11 @@
  */
 void
 audit_syscall_enter(unsigned short code, struct proc *proc, 
-			struct uthread *uthread)
+			struct thread *td)
 {
 	int audit_event;
 
-	assert(uthread->uu_ar == NULL);
+	KASSERT(td->td_ar == NULL, ("audit_syscall_enter: td->td_ar != NULL"));
 
 	audit_event = sys_au_event[code];
 
@@ -953,15 +875,15 @@
 #endif
 		if (au_preselect(audit_event, &proc->p_au->ai_mask,
 				AU_PRS_FAILURE | AU_PRS_SUCCESS)) {
-			uthread->uu_ar = audit_new(audit_event, proc, uthread);
+			td->td_ar = audit_new(audit_event, proc, td);
 		} else {
-			uthread->uu_ar = NULL;
+			td->td_ar = NULL;
 		}
 	}
 }
 
 void
-audit_syscall_exit(int error, struct proc *proc, struct uthread *uthread)
+audit_syscall_exit(int error, struct proc *proc, struct thread *td) 
 {
 	int retval;
 
@@ -976,12 +898,12 @@
 	if (error)
 		retval = -1;
 	else
-		retval = uthread->uu_rval[0];
+		retval = td->td_retval[0];
 
-	audit_commit(uthread->uu_ar, error, retval);
-	if (uthread->uu_ar != NULL)
+	audit_commit(td->td_ar, error, retval);
+	if (td->td_ar != NULL)
 		AUDIT_PRINTF(("audit record committed by pid %d\n", proc->p_pid));
-	uthread->uu_ar = NULL;
+	td->td_ar = NULL;
 
 }
 
@@ -1396,7 +1318,7 @@
 	if (p == NULL || upath == NULL) 
 		return;		/* nothing to do! */
 
-	if (flags & (ARG_UPATH1 | ARG_UPATH2) == 0)
+	if ((flags & (ARG_UPATH1 | ARG_UPATH2)) == 0)
 		return;
 
 	ar = currecord();
@@ -1449,7 +1371,7 @@
 	int len;
 	char **pathp;
 	struct vnode_au_info *vnp;
-	struct proc *p;
+	struct thread *td;
 
 	if (vp == NULL)
 		return;
@@ -1458,10 +1380,10 @@
 	if (ar == NULL)	/* This will be the case for unaudited system calls */
 		return;
 
-	if (flags & (ARG_VNODE1 | ARG_VNODE2) == 0)
+	if ((flags & (ARG_VNODE1 | ARG_VNODE2)) == 0)
 		return;
 
-	p = current_proc();
+	td = curthread;
 
 	if (flags & ARG_VNODE1) {
 		ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_KPATH1);
@@ -1494,7 +1416,7 @@
 	 * XXX: We'd assert the vnode lock here, only Darwin doesn't
 	 * appear to have vnode locking assertions.
 	 */
-	error = VOP_GETATTR(vp, &vattr, p->p_ucred, p);
+	error = VOP_GETATTR(vp, &vattr, td->td_ucred, td);
 	if (error) {
 		/* XXX: How to handle this case? */
 		return;

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#4 (text+ko) ====

@@ -193,11 +193,11 @@
 void			 audit_shutdown(void);
 
 struct kaudit_record	*audit_new(int event, struct proc *p,
-			    struct uthread *uthread);
+			    struct thread *td);
 
-void			 audit_syscall_enter(unsigned short code, 					    struct proc *proc, struct uthread *uthread);
+void			 audit_syscall_enter(unsigned short code, 					    struct proc *proc, struct thread *td);
 void			 audit_syscall_exit(int error, struct proc *proc,
-			    struct uthread *uthread);
+			    struct thread *td);
 
 int			kaudit_to_bsm(struct kaudit_record *kar,
 					struct au_record **pau);

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 11:20:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 306DE16A4D1; Sun, 11 Jan 2004 11:20:12 -0800 (PST)
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 09ACD16A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:20:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E254E43D54
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:20:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BJK20B067455
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:20:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BJK2xf067452
	for perforce@freebsd.org; Sun, 11 Jan 2004 11:20:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 11:20:02 -0800 (PST)
Message-Id: <200401111920.i0BJK2xf067452@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45155 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: Sun, 11 Jan 2004 19:20:12 -0000

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

Change 45155 by rwatson@rwatson_paprika on 2004/01/11 11:19:57

	Allocate a sysinit to run audit_init().  Might not be in the
	rate place yet.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/sys/kernel.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/sys/kernel.h#2 (text+ko) ====

@@ -130,6 +130,7 @@
 	SI_SUB_VM_CONF		= 0x2300000,	/* config VM, set limits*/
 	SI_SUB_RUN_QUEUE	= 0x2400000,	/* set up run queue*/
 	SI_SUB_KTRACE		= 0x2480000,	/* ktrace */
+	SI_SUB_AUDIT		= 0x24C0000,	/* audit */
 	SI_SUB_CREATE_INIT	= 0x2500000,	/* create init process*/
 	SI_SUB_SCHED_IDLE	= 0x2600000,	/* required idle procs */
 	SI_SUB_MBUF		= 0x2700000,	/* mbuf subsystem */

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 11:25:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD35316A4CE; Sun, 11 Jan 2004 11:25:33 -0800 (PST)
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 890A016A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:25:33 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AC3D643D2F
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:25:32 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BJPW0B069338
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:25:32 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BJPV8h069335
	for perforce@freebsd.org; Sun, 11 Jan 2004 11:25:31 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 11:25:31 -0800 (PST)
Message-Id: <200401111925.i0BJPV8h069335@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45157 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: Sun, 11 Jan 2004 19:25:34 -0000

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

Change 45157 by rwatson@rwatson_paprika on 2004/01/11 11:25:31

	Hook up audit_init() to its SYSINIT so that the audit system
	is started at boot.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#7 (text+ko) ====

@@ -29,6 +29,7 @@
 #include <sys/condvar.h>
 #include <sys/fcntl.h>
 #include <sys/ipc.h>
+#include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
@@ -421,6 +422,8 @@
 		panic("audit_init: kthread_create returned %d", error);
 }
 
+SYSINIT(audit_init, SI_SUB_AUDIT, SI_ORDER_FIRST, audit_init, NULL)
+
 static void
 audit_rotate_vnode(struct ucred *cred, struct vnode *vp)
 {

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 11:38:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F1A7716A4D1; Sun, 11 Jan 2004 11:38:04 -0800 (PST)
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 C435D16A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:38:04 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5B74443D4C
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:38:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BJc20B071442
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:38:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BJc19t071439
	for perforce@freebsd.org; Sun, 11 Jan 2004 11:38:01 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 11:38:01 -0800 (PST)
Message-Id: <200401111938.i0BJc19t071439@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45161 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: Sun, 11 Jan 2004 19:38:05 -0000

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

Change 45161 by rwatson@rwatson_paprika on 2004/01/11 11:37:01

	Process audit properties are stored in p_au -- a struct
	auditinfo pointer.
	
	Move forward declarations of structures to the common
	spot for them.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/sys/proc.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/sys/proc.h#3 (text+ko) ====

@@ -152,7 +152,9 @@
  * either lock is sufficient for read access, but both locks must be held
  * for write access.
  */
+struct auditinfo;
 struct ithd;
+struct kaudit_record;
 struct ke_sched;
 struct kg_sched;
 struct nlminfo;
@@ -253,7 +255,6 @@
  * with N runnable and queued KSEs in the KSEGRP, the first N threads
  * are linked to them. Other threads are not yet assigned.
  */
-struct kaudit_record;
 struct thread {
 	struct proc	*td_proc;	/* (*) Associated process. */
 	struct ksegrp	*td_ksegrp;	/* (*) Associated KSEG. */
@@ -603,6 +604,7 @@
 	struct sysentvec *p_sysent;	/* (b) Syscall dispatch info. */
 	struct pargs	*p_args;	/* (c) Process arguments. */
 	rlim_t		p_cpulimit;	/* (j) Current CPU limit in seconds. */
+	struct auditinfo	*p_au;	/* (c) Process audit properties. */
 /* End area that is copied on creation. */
 #define	p_endcopy	p_xstat
 

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 11:38:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 88D5516A4D8; Sun, 11 Jan 2004 11:38:05 -0800 (PST)
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 1A7C316A4E8
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:38:05 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D03E443D54
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:38:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BJc20B071448
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 11:38:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BJc2Dk071445
	for perforce@freebsd.org; Sun, 11 Jan 2004 11:38:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 11:38:02 -0800 (PST)
Message-Id: <200401111938.i0BJc2Dk071445@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45162 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: Sun, 11 Jan 2004 19:38:06 -0000

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

Change 45162 by rwatson@rwatson_paprika on 2004/01/11 11:37:01

	Remove macro wrapper for vn_rdwr(), and just use the FreeBSD
	syntax: we have a file_cred as well as an active_cred pointer.
	Since there's no file descriptor, just use active_cred, which
	is the cached credential from opening the audit file, so in
	fact is the right credential anyway.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#8 (text+ko) ====

@@ -48,10 +48,6 @@
 #define	kmem_alloc(map, ptrref, size)
 #define	kmem_free(map, ptr, size)
 
-#define	vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, resid, td) \
-	vn_rdwr((rw), (vp), (base), (len), (offset), (segflg), (ioflg), \
-	    (cred), NULL, (resid), (td))
-
 #ifdef AUDIT
 
 /*
@@ -179,7 +175,8 @@
 	 */
 	if (ar->k_udata != NULL) {
 		vn_rdwr(UIO_WRITE, vp, (void *)ar->k_udata, ar->k_ulen,
-		    (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, td);
+		    (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL,
+		    NULL, td);
 	}
 
 	/* 
@@ -202,7 +199,7 @@
 	 * take the BSM record as a parameter.
 	 */
 	ret = (vn_rdwr(UIO_WRITE, vp, (void *)bsm->data, bsm->len,
-	    (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, td));
+	    (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, NULL, td));
 
 	kau_free(bsm);
 

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 13:17:58 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BBB1B16A4D1; Sun, 11 Jan 2004 13:17:58 -0800 (PST)
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 9168516A4CE; Sun, 11 Jan 2004 13:17:58 -0800 (PST)
Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7A96643D2D; Sun, 11 Jan 2004 13:17:57 -0800 (PST)
	(envelope-from imp@bsdimp.com)
Received: from localhost (warner@rover2.village.org [10.0.0.1])
	by harmony.village.org (8.12.10/8.12.9) with ESMTP id i0BLHvET042369;
	Sun, 11 Jan 2004 14:17:57 -0700 (MST)
	(envelope-from imp@bsdimp.com)
Date: Sun, 11 Jan 2004 14:17:20 -0700 (MST)
Message-Id: <20040111.141720.72643752.imp@bsdimp.com>
To: jmallett@freebsd.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <200401110831.i0B8VlEh005999@repoman.freebsd.org>
References: <200401110831.i0B8VlEh005999@repoman.freebsd.org>
X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
cc: perforce@freebsd.org
Subject: Re: PERFORCE change 45121 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: Sun, 11 Jan 2004 21:17:59 -0000

In message: <200401110831.i0B8VlEh005999@repoman.freebsd.org>
            Juli Mallett <jmallett@freebsd.org> writes:
: 	Match other 64-bit platforms.  Time to use __LP64__ in these
: 	places?

NetBSD has a machine/foo.h file that defines things like this for the
target platform.  Well, __LP64__ is defined by the compiler, but you
get the idea...

Warner

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 13:28:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02C0C16A4D1; Sun, 11 Jan 2004 13:28:23 -0800 (PST)
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 D1E4516A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 13:28:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2370343D41
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 13:28:21 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BLSK0B003875
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 13:28:20 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BLSKw2003872
	for perforce@freebsd.org; Sun, 11 Jan 2004 13:28:20 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 13:28:20 -0800 (PST)
Message-Id: <200401112128.i0BLSKw2003872@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45170 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: Sun, 11 Jan 2004 21:28:23 -0000

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

Change 45170 by rwatson@rwatson_paprika on 2004/01/11 13:28:06

	Split vn_fullpath() into two functions:
	- vn_fullpath(): interogates the name cache to build a file
	  path back to either the rootvnode, or to optional_root.
	- vn_fullpath_thread(): does the same as vn_fullpath(), only
	  in the context of a process with a file descriptor array
	  and defined root directory, which is used as as the
	  optional_root argument to vn_fullpath().

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/kern/vfs_cache.c#2 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/vnode.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/kern/vfs_cache.c#2 (text+ko) ====

@@ -927,13 +927,14 @@
  * cache (if available)
  */
 int
-vn_fullpath(struct thread *td, struct vnode *vn, char **retbuf, char **freebuf)
+vn_fullpath(struct vnode *optional_root, struct vnode *vn, char **retbuf,
+    char **freebuf)
 {
 	char *bp, *buf;
 	int i, slash_prefixed;
-	struct filedesc *fdp;
 	struct namecache *ncp;
 	struct vnode *vp;
+	int error;
 
 	numfullpathcalls++;
 	if (disablefullpath)
@@ -943,58 +944,47 @@
 	buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	bp = buf + MAXPATHLEN - 1;
 	*bp = '\0';
-	fdp = td->td_proc->p_fd;
 	slash_prefixed = 0;
+	error = 0;
 	ASSERT_VOP_LOCKED(vn, "vn_fullpath");
-	FILEDESC_LOCK(fdp);
-	for (vp = vn; vp != fdp->fd_rdir && vp != rootvnode;) {
+	for (vp = vn; vp != optional_root && vp != rootvnode;) {
 		if (vp->v_vflag & VV_ROOT) {
 			if (vp->v_mount == NULL) {	/* forced unmount */
-				FILEDESC_UNLOCK(fdp);
-				free(buf, M_TEMP);
-				return (EBADF);
+				error = EBADF;
+				goto out1;
 			}
 			vp = vp->v_mount->mnt_vnodecovered;
 			continue;
 		}
 		if (vp != vn && vp->v_dd->v_id != vp->v_ddid) {
-			FILEDESC_UNLOCK(fdp);
-			free(buf, M_TEMP);
 			numfullpathfail1++;
-			return (ENOTDIR);
+			error = ENOTDIR;
+			goto out1;
 		}
 		CACHE_LOCK();
 		ncp = TAILQ_FIRST(&vp->v_cache_dst);
 		if (!ncp) {
 			numfullpathfail2++;
-			CACHE_UNLOCK();
-			FILEDESC_UNLOCK(fdp);
-			free(buf, M_TEMP);
-			return (ENOENT);
+			error = ENOENT;
+			goto out2;
 		}
 		if (vp != vn && ncp->nc_dvp != vp->v_dd) {
 			numfullpathfail3++;
-			CACHE_UNLOCK();
-			FILEDESC_UNLOCK(fdp);
-			free(buf, M_TEMP);
-			return (EBADF);
+			error = EBADF;
+			goto out2;
 		}
 		for (i = ncp->nc_nlen - 1; i >= 0; i--) {
 			if (bp == buf) {
 				numfullpathfail4++;
-				CACHE_UNLOCK();
-				FILEDESC_UNLOCK(fdp);
-				free(buf, M_TEMP);
-				return (ENOMEM);
+				error = ENOMEM;
+				goto out2;
 			}
 			*--bp = ncp->nc_name[i];
 		}
 		if (bp == buf) {
 			numfullpathfail4++;
-			CACHE_UNLOCK();
-			FILEDESC_UNLOCK(fdp);
-			free(buf, M_TEMP);
-			return (ENOMEM);
+			error = ENOMEM;
+			goto out2;
 		}
 		*--bp = '/';
 		slash_prefixed = 1;
@@ -1004,15 +994,44 @@
 	if (!slash_prefixed) {
 		if (bp == buf) {
 			numfullpathfail4++;
-			FILEDESC_UNLOCK(fdp);
-			free(buf, M_TEMP);
-			return (ENOMEM);
+			error = ENOMEM;
+			goto out1;
 		}
 		*--bp = '/';
 	}
-	FILEDESC_UNLOCK(fdp);
 	numfullpathfound++;
 	*retbuf = bp;
 	*freebuf = buf;
+out2:
+	CACHE_UNLOCK();
+out1:
+	if (error)
+		free(buf, M_TEMP);
 	return (0);
 }
+
+/*
+ * Perform a vn_fullpath() operation relative to a specific process's
+ * root.  The process is specified using a thread, which for locking
+ * reasons, should be curthread.  A better API might pass in a reference
+ * to struct filedesc * to specify what root to use.
+ */
+int
+vn_fullpath_thread(struct thread *td, struct vnode *vn, char **retbuf,
+    char **freebuf)
+{
+	struct filedesc *fdp;
+	int error;
+
+	/*
+	 * XXXVFS: This was the way it was done before, but perhaps
+	 * we should just vref() the fdp root directory, rather than
+	 * holding the file descriptor lock across the entire
+	 * operation?
+	 */
+	fdp = td->td_proc->p_fd;
+	FILEDESC_LOCK(fdp);
+	error = vn_fullpath(fdp->fd_rdir, vn, retbuf, freebuf);
+	FILEDESC_UNLOCK(fdp);
+	return (error);
+}

==== //depot/projects/trustedbsd/audit2/sys/sys/vnode.h#2 (text+ko) ====

@@ -610,8 +610,10 @@
 int	spec_vnoperate(struct vop_generic_args *);
 int	speedup_syncer(void);
 #define textvp_fullpath(p, rb, rfb) \
-	vn_fullpath(FIRST_THREAD_IN_PROC(p), (p)->p_textvp, rb, rfb)
-int	vn_fullpath(struct thread *td, struct vnode *vn,
+	vn_fullpath_thread(FIRST_THREAD_IN_PROC(p), (p)->p_textvp, rb, rfb)
+int	vn_fullpath(struct vnode *optional_root, struct vnode *vn,
+	    char **retbuf, char **freebuf);
+int	vn_fullpath_thread(struct thread *td, struct vnode *vn,
 	    char **retbuf, char **freebuf);
 int	vaccess(enum vtype type, mode_t file_mode, uid_t uid, gid_t gid,
 	    mode_t acc_mode, struct ucred *cred, int *privused);

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 13:34:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A101C16A4D1; Sun, 11 Jan 2004 13:34:30 -0800 (PST)
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 7A26116A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 13:34:30 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 201B143D46
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 13:34:29 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0BLYS0B005790
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 13:34:28 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0BLYSOL005787
	for perforce@freebsd.org; Sun, 11 Jan 2004 13:34:28 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 13:34:28 -0800 (PST)
Message-Id: <200401112134.i0BLYSOL005787@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45171 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: Sun, 11 Jan 2004 21:34:31 -0000

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

Change 45171 by rwatson@rwatson_paprika on 2004/01/11 13:33:55

	Use vn_fullpath_thread() since these calls to vn_fullpath()
	are done in the context of a process.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#2 edit
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs.c#2 edit
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_map.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ====

@@ -355,7 +355,8 @@
 	/* resolve symlinks etc. in the emulation tree prefix */
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
-	if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) == -1)
+	if (namei(&nd) != 0 || vn_fullpath_thread(td, nd.ni_vp, &dlep, &flep)
+	    == -1)
 		lep = linux_emul_path;
 	else
 		lep = dlep;
@@ -739,7 +740,7 @@
 	char *fullpath = "unknown";
 	char *freepath = NULL;
 
-	vn_fullpath(td, p->p_fd->fd_cdir, &fullpath, &freepath);
+	vn_fullpath_thread(td, p->p_fd->fd_cdir, &fullpath, &freepath);
 	sbuf_printf(sb, "%s", fullpath);
 	if (freepath)
 		free(freepath, M_TEMP);
@@ -757,7 +758,7 @@
 	char *freepath = NULL;
 
 	rvp = jailed(p->p_ucred) ? p->p_fd->fd_jdir : p->p_fd->fd_rdir;
-	vn_fullpath(td, rvp, &fullpath, &freepath);
+	vn_fullpath_thread(td, rvp, &fullpath, &freepath);
 	sbuf_printf(sb, "%s", fullpath);
 	if (freepath)
 		free(freepath, M_TEMP);
@@ -863,8 +864,9 @@
 			VM_OBJECT_LOCK(lobj);
 			off = IDX_TO_OFF(lobj->size);
 			if (lobj->type == OBJT_VNODE && lobj->handle) {
-				vn_fullpath(td, (struct vnode *)lobj->handle,
-				    &name, &freename);
+				vn_fullpath_thread(td,
+				    (struct vnode *)lobj->handle, &name,
+				    &freename);
 				ino = ((struct vnode *)
 				    lobj->handle)->v_cachedid;
 			}

==== //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs.c#2 (text+ko) ====

@@ -70,7 +70,7 @@
 	char *fullpath = "unknown";
 	char *freepath = NULL;
 
-	vn_fullpath(td, p->p_textvp, &fullpath, &freepath);
+	vn_fullpath_thread(td, p->p_textvp, &fullpath, &freepath);
 	sbuf_printf(sb, "%s", fullpath);
 	if (freepath)
 		free(freepath, M_TEMP);

==== //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_map.c#2 (text+ko) ====

@@ -138,7 +138,7 @@
 				break;
 			case OBJT_VNODE:
 				type = "vnode";
-				vn_fullpath(td,
+				vn_fullpath_thread(td,
 				    (struct vnode *)lobj->handle,
 				    &fullpath,
 				    &freepath);

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 17:24:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 302AD16A4D1; Sun, 11 Jan 2004 17:24:23 -0800 (PST)
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 0701216A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 17:24:23 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 23AD443D31
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 17:24:19 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C1OJ0B063761
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 17:24:19 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C1OC6p063758
	for perforce@freebsd.org; Sun, 11 Jan 2004 17:24:12 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Sun, 11 Jan 2004 17:24:12 -0800 (PST)
Message-Id: <200401120124.i0C1OC6p063758@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45181 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: Mon, 12 Jan 2004 01:24:23 -0000

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

Change 45181 by marcel@marcel_nfs on 2004/01/11 17:23:46

	IFC @45180

Affected files ...

.. //depot/projects/ia64/COPYRIGHT#2 integrate
.. //depot/projects/ia64/UPDATING#60 integrate
.. //depot/projects/ia64/bin/chmod/chmod.c#8 integrate
.. //depot/projects/ia64/bin/date/date.1#5 integrate
.. //depot/projects/ia64/bin/rm/rm.c#10 integrate
.. //depot/projects/ia64/bin/sh/eval.c#8 integrate
.. //depot/projects/ia64/contrib/amd/fsinfo/fsinfo.8#4 integrate
.. //depot/projects/ia64/contrib/gcc/c-lex.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/alpha/freebsd.h#9 integrate
.. //depot/projects/ia64/contrib/gcc/config/alpha/linux-ecoff.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/alpha/osf12.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/alpha/osf2or3.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/arm/arm-wince-pe.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/arm/riscix.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/arm/riscix1-1.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/arm/rix-gas.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/arm/t-riscix#2 delete
.. //depot/projects/ia64/contrib/gcc/config/float-c4x.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/float-i128.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/float-i32.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/float-i386.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/float-i64.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/float-m68k.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/float-sh.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/float-sparc.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/float-vax.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/386bsd.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/aix386.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/aix386ng.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/bsd386.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/dgux.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/djgpp-rtems.h#4 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#21 integrate
.. //depot/projects/ia64/contrib/gcc/config/i386/freebsd64.h#6 integrate
.. //depot/projects/ia64/contrib/gcc/config/i386/interix.c#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/isc.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/isccoff.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/iscdbx.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/linux-oldld.h#4 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/next.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/osf1-ci.asm#2 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/osf1-cn.asm#2 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/osf1elf.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/osf1elfgdb.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/osfelf.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/osfrose.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/rtems.h#4 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/seq-gas.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/seq-sysv3.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/seq2-sysv3.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/sequent.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/sol2gas.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/sun.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/sun386.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/t-dgux#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/t-next#3 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/t-osf#2 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/t-osf1elf#2 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/t-sco5gas#4 delete
.. //depot/projects/ia64/contrib/gcc/config/i386/v3gas.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/nextstep-protos.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/nextstep.c#3 delete
.. //depot/projects/ia64/contrib/gcc/config/nextstep.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/nextstep21.h#3 delete
.. //depot/projects/ia64/contrib/gcc/config/rs6000/softfloat.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/s390/t-linux#2 delete
.. //depot/projects/ia64/contrib/gcc/config/sparc/freebsd.h#9 integrate
.. //depot/projects/ia64/contrib/gcc/config/sparc/rtems.h#4 delete
.. //depot/projects/ia64/contrib/gcc/config/sparc/sol2-g1.asm#2 delete
.. //depot/projects/ia64/contrib/gcc/config/sparc/sol27-sld.h#2 delete
.. //depot/projects/ia64/contrib/gcc/config/t-install-cpp#3 delete
.. //depot/projects/ia64/contrib/gcc/cp/mpw-config.in#2 delete
.. //depot/projects/ia64/contrib/gcc/cp/mpw-make.sed#2 delete
.. //depot/projects/ia64/contrib/gcc/dependence.c#2 delete
.. //depot/projects/ia64/contrib/gcc/doc/vms.texi#2 delete
.. //depot/projects/ia64/contrib/gcc/enquire.c#3 delete
.. //depot/projects/ia64/contrib/gcc/f/version.c#10 delete
.. //depot/projects/ia64/contrib/gcc/f/version.h#3 delete
.. //depot/projects/ia64/contrib/gcc/function.c#11 integrate
.. //depot/projects/ia64/contrib/gcc/ggc-callbacks.c#2 delete
.. //depot/projects/ia64/contrib/gcc/halfpic.c#3 delete
.. //depot/projects/ia64/contrib/gcc/halfpic.h#3 delete
.. //depot/projects/ia64/contrib/gcc/hash.c#3 delete
.. //depot/projects/ia64/contrib/gcc/hash.h#3 delete
.. //depot/projects/ia64/contrib/gcc/tradcif.y#3 delete
.. //depot/projects/ia64/contrib/gcc/tradcpp.c#6 delete
.. //depot/projects/ia64/contrib/gcc/tradcpp.h#3 delete
.. //depot/projects/ia64/contrib/ipfilter/ipmon.c#6 integrate
.. //depot/projects/ia64/contrib/libf2c/ChangeLog.egcs#2 delete
.. //depot/projects/ia64/contrib/libf2c/libI77/rawio.h#2 delete
.. //depot/projects/ia64/contrib/libobjc/objc-features.texi#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/generic/bits/limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#4 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#3 delete
.. //depot/projects/ia64/contrib/libstdc++/configure.host#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/backward/strstream.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/bits/generic_shadow.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/bits/slice.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/assert.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_climits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/ctype.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/errno.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/fcntl.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/features.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/float.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/iconv.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/iolibio.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/langinfo.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/libio.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/libioP.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/limits.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/locale.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/math.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/pthread.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/setjmp.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/signal.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stdarg.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stddef.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stdio.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stdlib.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/string.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/sys/cdefs.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/time.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/unistd.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/wchar.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/include/c_shadow/wctype.h#2 delete
.. //depot/projects/ia64/contrib/libstdc++/mkcshadow#2 delete
.. //depot/projects/ia64/contrib/libstdc++/mkinclosure#2 delete
.. //depot/projects/ia64/contrib/pnpinfo/pnpinfo.c#3 integrate
.. //depot/projects/ia64/contrib/tcp_wrappers/socket.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/CREDITS#3 integrate
.. //depot/projects/ia64/crypto/openssh/ChangeLog#5 integrate
.. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#5 integrate
.. //depot/projects/ia64/crypto/openssh/INSTALL#4 integrate
.. //depot/projects/ia64/crypto/openssh/LICENCE#5 integrate
.. //depot/projects/ia64/crypto/openssh/Makefile.in#5 integrate
.. //depot/projects/ia64/crypto/openssh/README.dns#1 branch
.. //depot/projects/ia64/crypto/openssh/README.privsep#4 integrate
.. //depot/projects/ia64/crypto/openssh/README.smartcard#3 integrate
.. //depot/projects/ia64/crypto/openssh/TODO#5 integrate
.. //depot/projects/ia64/crypto/openssh/acconfig.h#6 integrate
.. //depot/projects/ia64/crypto/openssh/atomicio.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/atomicio.h#3 integrate
.. //depot/projects/ia64/crypto/openssh/auth-krb4.c#7 delete
.. //depot/projects/ia64/crypto/openssh/auth-krb5.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/auth-options.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/auth-pam.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/auth-pam.h#5 integrate
.. //depot/projects/ia64/crypto/openssh/auth-passwd.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/auth-rh-rsa.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/auth-rhosts.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/auth-rsa.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/auth-sia.h#3 integrate
.. //depot/projects/ia64/crypto/openssh/auth.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/auth.h#7 integrate
.. //depot/projects/ia64/crypto/openssh/auth1.c#9 integrate
.. //depot/projects/ia64/crypto/openssh/auth2-chall.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/auth2-gss.c#1 branch
.. //depot/projects/ia64/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#13 delete
.. //depot/projects/ia64/crypto/openssh/auth2-pam.c#8 delete
.. //depot/projects/ia64/crypto/openssh/auth2-pam.h#2 delete
.. //depot/projects/ia64/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/auth2.c#9 integrate
.. //depot/projects/ia64/crypto/openssh/authfd.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/authfd.h#6 integrate
.. //depot/projects/ia64/crypto/openssh/authfile.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/bufaux.c#6 integrate
.. //depot/projects/ia64/crypto/openssh/bufaux.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/buffer.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/canohost.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/channels.c#10 integrate
.. //depot/projects/ia64/crypto/openssh/cipher-3des1.c#1 branch
.. //depot/projects/ia64/crypto/openssh/cipher-aes.c#1 branch
.. //depot/projects/ia64/crypto/openssh/cipher-bf1.c#1 branch
.. //depot/projects/ia64/crypto/openssh/cipher-ctr.c#1 branch
.. //depot/projects/ia64/crypto/openssh/cipher.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/clientloop.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/compat.c#6 integrate
.. //depot/projects/ia64/crypto/openssh/compat.h#7 integrate
.. //depot/projects/ia64/crypto/openssh/config.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/configure.ac#5 integrate
.. //depot/projects/ia64/crypto/openssh/deattack.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/defines.h#5 integrate
.. //depot/projects/ia64/crypto/openssh/dh.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/dispatch.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/dns.c#1 branch
.. //depot/projects/ia64/crypto/openssh/dns.h#1 branch
.. //depot/projects/ia64/crypto/openssh/entropy.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/groupaccess.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/gss-genr.c#1 branch
.. //depot/projects/ia64/crypto/openssh/gss-serv-krb5.c#1 branch
.. //depot/projects/ia64/crypto/openssh/gss-serv.c#1 branch
.. //depot/projects/ia64/crypto/openssh/hostfile.c#6 integrate
.. //depot/projects/ia64/crypto/openssh/includes.h#7 integrate
.. //depot/projects/ia64/crypto/openssh/key.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/key.h#5 integrate
.. //depot/projects/ia64/crypto/openssh/log.c#6 integrate
.. //depot/projects/ia64/crypto/openssh/log.h#7 integrate
.. //depot/projects/ia64/crypto/openssh/loginrec.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/loginrec.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/logintest.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/md5crypt.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/md5crypt.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/mdoc2man.awk#1 branch
.. //depot/projects/ia64/crypto/openssh/mdoc2man.pl#2 delete
.. //depot/projects/ia64/crypto/openssh/misc.c#6 integrate
.. //depot/projects/ia64/crypto/openssh/misc.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/moduli.c#1 branch
.. //depot/projects/ia64/crypto/openssh/moduli.h#1 branch
.. //depot/projects/ia64/crypto/openssh/monitor.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/monitor.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/monitor_fdpass.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/monitor_mm.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/monitor_wrap.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/monitor_wrap.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/msg.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/myproposal.h#6 integrate
.. //depot/projects/ia64/crypto/openssh/nchan.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/Makefile.in#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/base64.h#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/basename.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/basename.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bindresvport.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-arc4random.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cray.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-getpeereid.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.h#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-nextstep.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-snprintf.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-waitpid.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/daemon.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/dirname.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/dirname.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-gai-errnos.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#3 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#3 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-getnameinfo.c#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-getnameinfo.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-rfc2553.c#1 branch
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-rfc2553.h#1 branch
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-socket.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getcwd.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getcwd.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getgrouplist.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getopt.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getopt.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getrrsetbyname.c#1 branch
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/getrrsetbyname.h#1 branch
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.h#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_aton.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntoa.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntoa.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntop.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/mktemp.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/mktemp.h#3 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-irix.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-irix.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/realpath.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/realpath.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/rresvport.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/rresvport.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/setenv.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/setenv.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/setproctitle.h#3 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcat.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcat.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcpy.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcpy.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strmode.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strmode.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strsep.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/strsep.h#2 delete
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/vis.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/vis.h#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/xcrypt.c#1 branch
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/xmmap.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/openbsd-compat/xmmap.h#2 delete
.. //depot/projects/ia64/crypto/openssh/packet.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/packet.h#5 integrate
.. //depot/projects/ia64/crypto/openssh/progressmeter.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/radix.c#5 delete
.. //depot/projects/ia64/crypto/openssh/radix.h#3 delete
.. //depot/projects/ia64/crypto/openssh/readconf.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/readconf.h#5 integrate
.. //depot/projects/ia64/crypto/openssh/regress/Makefile#3 integrate
.. //depot/projects/ia64/crypto/openssh/regress/README.regress#1 branch
.. //depot/projects/ia64/crypto/openssh/regress/agent-getpeereid.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/agent-ptrace.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/agent-timeout.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/agent.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/authorized_keys_root#2 delete
.. //depot/projects/ia64/crypto/openssh/regress/dynamic-forward.sh#1 branch
.. //depot/projects/ia64/crypto/openssh/regress/forwarding.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/proto-version.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/reconfigure.sh#1 branch
.. //depot/projects/ia64/crypto/openssh/regress/rekey.sh#1 branch
.. //depot/projects/ia64/crypto/openssh/regress/sftp-badcmds.sh#1 branch
.. //depot/projects/ia64/crypto/openssh/regress/sftp-batch.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/sftp-cmds.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/sftp.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/ssh-com-client.sh#3 integrate
.. //depot/projects/ia64/crypto/openssh/regress/ssh-com-keygen.sh#3 integrate
.. //depot/projects/ia64/crypto/openssh/regress/ssh-com-sftp.sh#3 integrate
.. //depot/projects/ia64/crypto/openssh/regress/ssh-com.sh#3 integrate
.. //depot/projects/ia64/crypto/openssh/regress/stderr-after-eof.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/stderr-data.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/test-exec.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/transfer.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/try-ciphers.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/regress/yes-head.sh#2 integrate
.. //depot/projects/ia64/crypto/openssh/scard-opensc.c#2 integrate
.. //depot/projects/ia64/crypto/openssh/scard.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/scard.h#4 integrate
.. //depot/projects/ia64/crypto/openssh/scp.1#6 integrate
.. //depot/projects/ia64/crypto/openssh/scp.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/servconf.c#11 integrate
.. //depot/projects/ia64/crypto/openssh/servconf.h#5 integrate
.. //depot/projects/ia64/crypto/openssh/serverloop.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/session.c#18 integrate
.. //depot/projects/ia64/crypto/openssh/session.h#7 integrate
.. //depot/projects/ia64/crypto/openssh/sftp-client.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/sftp-common.c#6 integrate
.. //depot/projects/ia64/crypto/openssh/sftp-int.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/sftp-server.8#4 integrate
.. //depot/projects/ia64/crypto/openssh/sftp-server.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/sftp.1#6 integrate
.. //depot/projects/ia64/crypto/openssh/sftp.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-add.1#5 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-add.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-agent.1#6 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-agent.c#9 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-dss.h#4 delete
.. //depot/projects/ia64/crypto/openssh/ssh-gss.h#1 branch
.. //depot/projects/ia64/crypto/openssh/ssh-keygen.1#5 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-keyscan.1#4 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-keysign.8#4 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-keysign.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-rand-helper.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-rsa.c#7 integrate
.. //depot/projects/ia64/crypto/openssh/ssh-rsa.h#4 delete
.. //depot/projects/ia64/crypto/openssh/ssh.1#7 integrate
.. //depot/projects/ia64/crypto/openssh/ssh.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/ssh.h#7 integrate
.. //depot/projects/ia64/crypto/openssh/ssh2.h#3 integrate
.. //depot/projects/ia64/crypto/openssh/ssh_config#13 integrate
.. //depot/projects/ia64/crypto/openssh/ssh_config.5#9 integrate
.. //depot/projects/ia64/crypto/openssh/sshconnect.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/sshconnect1.c#6 integrate
.. //depot/projects/ia64/crypto/openssh/sshconnect2.c#9 integrate
.. //depot/projects/ia64/crypto/openssh/sshd.8#10 integrate
.. //depot/projects/ia64/crypto/openssh/sshd.c#10 integrate
.. //depot/projects/ia64/crypto/openssh/sshd_config#14 integrate
.. //depot/projects/ia64/crypto/openssh/sshd_config.5#10 integrate
.. //depot/projects/ia64/crypto/openssh/sshlogin.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/sshpty.c#8 integrate
.. //depot/projects/ia64/crypto/openssh/sshtty.c#3 integrate
.. //depot/projects/ia64/crypto/openssh/ttymodes.c#4 integrate
.. //depot/projects/ia64/crypto/openssh/uidswap.c#5 integrate
.. //depot/projects/ia64/crypto/openssh/version.h#14 integrate
.. //depot/projects/ia64/crypto/openssl/apps/openssl.cnf#3 integrate
.. //depot/projects/ia64/etc/Makefile#38 integrate
.. //depot/projects/ia64/etc/apmd.conf#3 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#45 integrate
.. //depot/projects/ia64/etc/devd.conf#9 integrate
.. //depot/projects/ia64/etc/moduli#2 delete
.. //depot/projects/ia64/etc/mtree/BSD.local.dist#20 integrate
.. //depot/projects/ia64/etc/mtree/BSD.usr.dist#30 integrate
.. //depot/projects/ia64/etc/periodic/daily/150.clean-hoststat#4 integrate
.. //depot/projects/ia64/etc/rc.d/Makefile#23 integrate
.. //depot/projects/ia64/etc/rc.d/cron#4 integrate
.. //depot/projects/ia64/etc/rc.d/diskless#11 integrate
.. //depot/projects/ia64/etc/rc.d/mountcritlocal#7 integrate
.. //depot/projects/ia64/etc/rc.d/power_profile#1 branch
.. //depot/projects/ia64/etc/rc.resume#3 integrate
.. //depot/projects/ia64/etc/rc.suspend#3 integrate
.. //depot/projects/ia64/etc/sendmail/freebsd.mc#9 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes#35 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes2#20 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#9 integrate
.. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#12 integrate
.. //depot/projects/ia64/games/fortune/datfiles/murphy#4 integrate
.. //depot/projects/ia64/games/fortune/datfiles/startrek#6 integrate
.. //depot/projects/ia64/games/fortune/fortune/fortune.c#5 integrate
.. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#21 integrate
.. //depot/projects/ia64/gnu/usr.bin/cc/cc_int/Makefile#10 integrate
.. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#14 integrate
.. //depot/projects/ia64/gnu/usr.bin/cc/f77/Makefile#5 integrate
.. //depot/projects/ia64/gnu/usr.bin/cc/f771/Makefile#4 integrate
.. //depot/projects/ia64/include/fnmatch.h#4 integrate
.. //depot/projects/ia64/include/nss.h#2 integrate
.. //depot/projects/ia64/include/paths.h#12 integrate
.. //depot/projects/ia64/include/regex.h#4 integrate
.. //depot/projects/ia64/kerberos5/Makefile.inc#12 integrate
.. //depot/projects/ia64/lib/libc/Makefile#13 integrate
.. //depot/projects/ia64/lib/libc/alpha/gen/fpgetmask.c#3 integrate
.. //depot/projects/ia64/lib/libc/alpha/gen/fpsetmask.c#3 integrate
.. //depot/projects/ia64/lib/libc/alpha/gen/makecontext.c#4 integrate
.. //depot/projects/ia64/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate
.. //depot/projects/ia64/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate
.. //depot/projects/ia64/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate
.. //depot/projects/ia64/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate
.. //depot/projects/ia64/lib/libc/gdtoa/Makefile.inc#3 integrate
.. //depot/projects/ia64/lib/libc/gen/opendir.c#5 integrate
.. //depot/projects/ia64/lib/libc/gen/sysconf.3#4 integrate
.. //depot/projects/ia64/lib/libc/gen/ttyname.c#5 integrate
.. //depot/projects/ia64/lib/libc/gmon/mcount.c#3 integrate
.. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ioperm.c#4 integrate
.. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.c#4 integrate
.. //depot/projects/ia64/lib/libc/i386/sys/i386_set_ioperm.c#4 integrate
.. //depot/projects/ia64/lib/libc/i386/sys/i386_set_ldt.c#4 integrate
.. //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.c#4 integrate
.. //depot/projects/ia64/lib/libc/ia64/gen/makecontext.c#5 integrate
.. //depot/projects/ia64/lib/libc/ia64/gen/signalcontext.c#2 integrate
.. //depot/projects/ia64/lib/libc/locale/gbk.c#3 integrate
.. //depot/projects/ia64/lib/libc/locale/setlocale.c#10 integrate
.. //depot/projects/ia64/lib/libc/locale/srune.c#2 integrate
.. //depot/projects/ia64/lib/libc/locale/wcstold.c#3 integrate
.. //depot/projects/ia64/lib/libc/net/nss_compat.c#2 integrate
.. //depot/projects/ia64/lib/libc/net/res_send.c#5 integrate
.. //depot/projects/ia64/lib/libc/posix1e/acl_delete_entry.c#4 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac.c#8 integrate
.. //depot/projects/ia64/lib/libc/rpc/Makefile.inc#6 integrate
.. //depot/projects/ia64/lib/libc/rpc/auth_time.c#5 integrate
.. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu.c#8 integrate
.. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#4 integrate
.. //depot/projects/ia64/lib/libc/sparc64/gen/signalcontext.c#2 integrate
.. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#3 integrate
.. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap.c#4 integrate
.. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_install.c#2 integrate
.. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#5 integrate
.. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#12 integrate
.. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#9 integrate
.. //depot/projects/ia64/lib/libc/stdio/vfwscanf.c#6 integrate
.. //depot/projects/ia64/lib/libc/stdlib/atexit.c#4 integrate
.. //depot/projects/ia64/lib/libc/stdlib/atexit.h#3 integrate
.. //depot/projects/ia64/lib/libc/stdlib/exit.c#3 integrate
.. //depot/projects/ia64/lib/libc/string/index.c#5 integrate
.. //depot/projects/ia64/lib/libc/string/rindex.c#5 integrate
.. //depot/projects/ia64/lib/libc/sys/accept.2#8 integrate
.. //depot/projects/ia64/lib/libc/sys/getpeername.2#4 integrate
.. //depot/projects/ia64/lib/libc/sys/getsockname.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/getsockopt.2#6 integrate
.. //depot/projects/ia64/lib/libc/sys/ktrace.2#6 integrate
.. //depot/projects/ia64/lib/libc/sys/ptrace.2#9 integrate
.. //depot/projects/ia64/lib/libc/sys/recv.2#5 integrate
.. //depot/projects/ia64/lib/libc/sys/sendfile.2#7 integrate
.. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#18 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_join.c#4 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_rwlock.c#4 integrate
.. //depot/projects/ia64/lib/libc_r/uthread/uthread_write.c#5 integrate
.. //depot/projects/ia64/lib/libio/alpha_sethae.c#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/Makefile.inc#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_attr.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_equal.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_exit.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_getspecific.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_join.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_key_create.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_key_delete.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_kill.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_mutex_lock.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_mutexattr.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_once.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_rwlock_wrlock.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_schedparam.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_self.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_setspecific.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_sigmask.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/pthread_testcancel.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/sem_destroy.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/man/sem_getvalue.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/sem_init.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/sem_post.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/sem_wait.3#2 integrate
.. //depot/projects/ia64/lib/libpthread/man/sigwait.3#3 integrate
.. //depot/projects/ia64/lib/libpthread/pthread.map#9 integrate
.. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#14 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#15 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#43 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#30 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#7 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#26 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/ia64/lib/libsdp/sdp-int.h#2 integrate
.. //depot/projects/ia64/lib/libsdp/sdp.3#2 integrate
.. //depot/projects/ia64/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/ia64/lib/libsdp/search.c#3 integrate
.. //depot/projects/ia64/lib/libsdp/session.c#2 integrate
.. //depot/projects/ia64/lib/libsdp/util.c#3 integrate
.. //depot/projects/ia64/lib/libstand/Makefile#16 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_create.c#9 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_init.c#9 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_kern.c#10 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#15 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_private.h#11 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_setschedparam.c#3 integrate
.. //depot/projects/ia64/lib/libusbhid/usbhid.3#6 integrate
.. //depot/projects/ia64/libexec/ftpd/ftpd.c#24 integrate
.. //depot/projects/ia64/libexec/rshd/rshd.8#5 integrate
.. //depot/projects/ia64/libexec/rtld-elf/rtld.c#21 integrate
.. //depot/projects/ia64/release/Makefile#75 integrate
.. //depot/projects/ia64/release/Makefile.inc.docports#12 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#31 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#136 integrate
.. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#9 integrate
.. //depot/projects/ia64/release/i386/drivers.conf#25 integrate
.. //depot/projects/ia64/release/scripts/mkpkgindex.sh#1 branch
.. //depot/projects/ia64/rescue/rescue/Makefile#15 integrate
.. //depot/projects/ia64/sbin/Makefile#34 integrate
.. //depot/projects/ia64/sbin/bsdlabel/Makefile#7 integrate
.. //depot/projects/ia64/sbin/comcontrol/comcontrol.8#3 integrate
.. //depot/projects/ia64/sbin/dump/main.c#20 integrate
.. //depot/projects/ia64/sbin/fdisk/fdisk.c#19 integrate
.. //depot/projects/ia64/sbin/fsck/fsutil.c#4 integrate
.. //depot/projects/ia64/sbin/fsck/fsutil.h#4 integrate
.. //depot/projects/ia64/sbin/fsck_ffs/Makefile#5 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/Makefile#3 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/boot.c#3 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/check.c#5 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/dir.c#3 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/dosfs.h#3 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/ext.h#6 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/fat.c#4 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#8 integrate
.. //depot/projects/ia64/sbin/fsck_msdosfs/main.c#6 integrate
.. //depot/projects/ia64/sbin/growfs/growfs.8#11 integrate
.. //depot/projects/ia64/sbin/ip6fw/ip6fw.8#9 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw.8#30 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw2.c#30 integrate
.. //depot/projects/ia64/sbin/mdconfig/mdconfig.8#10 integrate
.. //depot/projects/ia64/sbin/mknod/mknod.8#8 integrate
.. //depot/projects/ia64/sbin/mount/mount.c#15 integrate
.. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.8#7 integrate
.. //depot/projects/ia64/secure/lib/libssh/Makefile#11 integrate
.. //depot/projects/ia64/secure/libexec/sftp-server/Makefile#8 integrate
.. //depot/projects/ia64/secure/libexec/ssh-keysign/Makefile#3 integrate
.. //depot/projects/ia64/secure/usr.bin/scp/Makefile#8 integrate
.. //depot/projects/ia64/secure/usr.bin/sftp/Makefile#8 integrate
.. //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#7 integrate
.. //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#7 integrate
.. //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#7 integrate
.. //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#6 integrate
.. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#11 integrate
.. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#16 integrate
.. //depot/projects/ia64/share/colldef/Makefile#19 integrate
.. //depot/projects/ia64/share/colldef/be_BY.CP1131.src#1 branch
.. //depot/projects/ia64/share/colldef/be_BY.CP1251.src#1 branch
.. //depot/projects/ia64/share/colldef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/ia64/share/colldef/map.CP1131#1 branch
.. //depot/projects/ia64/share/examples/scsi_target/scsi_cmds.c#5 integrate
.. //depot/projects/ia64/share/examples/scsi_target/scsi_target.h#3 integrate
.. //depot/projects/ia64/share/man/man3/Makefile#6 integrate
.. //depot/projects/ia64/share/man/man3/pthread.3#4 integrate
.. //depot/projects/ia64/share/man/man3/pthread_mutex_timedlock.3#1 branch
.. //depot/projects/ia64/share/man/man4/Makefile#66 integrate
.. //depot/projects/ia64/share/man/man4/acpi.4#16 integrate
.. //depot/projects/ia64/share/man/man4/acpi_thermal.4#1 branch
.. //depot/projects/ia64/share/man/man4/amr.4#6 integrate
.. //depot/projects/ia64/share/man/man4/ath.4#13 integrate
.. //depot/projects/ia64/share/man/man4/ath_hal.4#7 integrate
.. //depot/projects/ia64/share/man/man4/aue.4#4 integrate
.. //depot/projects/ia64/share/man/man4/crypto.4#4 integrate
.. //depot/projects/ia64/share/man/man4/dcons.4#2 integrate
.. //depot/projects/ia64/share/man/man4/dcons_crom.4#2 integrate
.. //depot/projects/ia64/share/man/man4/digi.4#2 integrate
.. //depot/projects/ia64/share/man/man4/ef.4#5 integrate
.. //depot/projects/ia64/share/man/man4/firewire.4#9 integrate
.. //depot/projects/ia64/share/man/man4/fpa.4#4 integrate
.. //depot/projects/ia64/share/man/man4/fwe.4#5 integrate
.. //depot/projects/ia64/share/man/man4/fwohci.4#7 integrate
.. //depot/projects/ia64/share/man/man4/gdb.4#1 branch
.. //depot/projects/ia64/share/man/man4/gx.4#5 integrate
.. //depot/projects/ia64/share/man/man4/harp.4#2 integrate
.. //depot/projects/ia64/share/man/man4/kue.4#4 integrate
.. //depot/projects/ia64/share/man/man4/lge.4#2 integrate
.. //depot/projects/ia64/share/man/man4/mac_stub.4#2 integrate
.. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#17 integrate
.. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#5 integrate
.. //depot/projects/ia64/share/man/man4/man4.i386/ndis.4#2 integrate
.. //depot/projects/ia64/share/man/man4/matcd.4#3 integrate
.. //depot/projects/ia64/share/man/man4/meteor.4#2 integrate
.. //depot/projects/ia64/share/man/man4/miibus.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ng_atm.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ng_atmpif.4#2 integrate
.. //depot/projects/ia64/share/man/man4/ng_pppoe.4#6 integrate
.. //depot/projects/ia64/share/man/man4/ng_sscfu.4#2 integrate
.. //depot/projects/ia64/share/man/man4/ng_sscop.4#2 integrate
.. //depot/projects/ia64/share/man/man4/ng_uni.4#2 integrate
.. //depot/projects/ia64/share/man/man4/nge.4#4 integrate
.. //depot/projects/ia64/share/man/man4/pccbb.4#4 integrate
.. //depot/projects/ia64/share/man/man4/polling.4#7 integrate
.. //depot/projects/ia64/share/man/man4/re.4#3 integrate
.. //depot/projects/ia64/share/man/man4/rndtest.4#3 integrate
.. //depot/projects/ia64/share/man/man4/rue.4#4 integrate
.. //depot/projects/ia64/share/man/man4/safe.4#2 integrate
.. //depot/projects/ia64/share/man/man4/sbp.4#10 integrate
.. //depot/projects/ia64/share/man/man4/sbp_targ.4#2 integrate
.. //depot/projects/ia64/share/man/man4/sk.4#5 integrate
.. //depot/projects/ia64/share/man/man4/ste.4#3 integrate
.. //depot/projects/ia64/share/man/man4/umass.4#12 integrate
.. //depot/projects/ia64/share/man/man4/uscanner.4#5 integrate
.. //depot/projects/ia64/share/man/man4/utopia.4#5 integrate
.. //depot/projects/ia64/share/man/man4/vinumdebug.4#1 branch
.. //depot/projects/ia64/share/man/man4/vpo.4#5 integrate
.. //depot/projects/ia64/share/man/man4/xe.4#2 integrate
.. //depot/projects/ia64/share/man/man5/devfs.5#4 integrate
.. //depot/projects/ia64/share/man/man5/rc.conf.5#48 integrate
.. //depot/projects/ia64/share/man/man7/release.7#27 integrate
.. //depot/projects/ia64/share/man/man8/diskless.8#10 integrate
.. //depot/projects/ia64/share/man/man9/Makefile#38 integrate
.. //depot/projects/ia64/share/man/man9/mutex.9#12 integrate
.. //depot/projects/ia64/share/man/man9/sbuf.9#6 integrate
.. //depot/projects/ia64/share/man/man9/sx.9#9 integrate
.. //depot/projects/ia64/share/man/man9/taskqueue.9#5 integrate
.. //depot/projects/ia64/share/man/man9/vn_fullpath.9#1 branch
.. //depot/projects/ia64/share/mk/bsd.cpu.mk#17 integrate
.. //depot/projects/ia64/share/mk/bsd.obj.mk#8 integrate
.. //depot/projects/ia64/share/mk/bsd.sys.mk#22 integrate
.. //depot/projects/ia64/share/mklocale/Makefile#16 integrate
.. //depot/projects/ia64/share/mklocale/be_BY.CP1131.src#1 branch
.. //depot/projects/ia64/share/mklocale/zh_HK.Big5HKSCS.src#1 branch
.. //depot/projects/ia64/share/monetdef/Makefile#15 integrate
.. //depot/projects/ia64/share/monetdef/be_BY.CP1131.src#1 branch
.. //depot/projects/ia64/share/monetdef/be_BY.CP1251.src#1 branch
.. //depot/projects/ia64/share/monetdef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/ia64/share/msgdef/Makefile#15 integrate
.. //depot/projects/ia64/share/msgdef/be_BY.CP1131.src#1 branch
.. //depot/projects/ia64/share/msgdef/be_BY.CP1251.src#1 branch
.. //depot/projects/ia64/share/msgdef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/ia64/share/numericdef/Makefile#15 integrate
.. //depot/projects/ia64/share/numericdef/be_BY.CP1251.src#1 branch
.. //depot/projects/ia64/share/syscons/fonts/INDEX.fonts#7 integrate
.. //depot/projects/ia64/share/syscons/fonts/Makefile#6 integrate
.. //depot/projects/ia64/share/syscons/fonts/swiss-1131-8x16.fnt#1 branch
.. //depot/projects/ia64/share/syscons/fonts/swiss-1251-8x16.fnt#1 branch
.. //depot/projects/ia64/share/syscons/keymaps/INDEX.keymaps#10 integrate
.. //depot/projects/ia64/share/syscons/keymaps/Makefile#12 integrate
.. //depot/projects/ia64/share/syscons/keymaps/by.cp1131.kbd#1 branch
.. //depot/projects/ia64/share/syscons/keymaps/by.cp1251.kbd#1 branch
.. //depot/projects/ia64/share/syscons/keymaps/by.iso5.kbd#1 branch
.. //depot/projects/ia64/share/timedef/Makefile#15 integrate
.. //depot/projects/ia64/share/timedef/be_BY.CP1131.src#1 branch
.. //depot/projects/ia64/share/timedef/be_BY.CP1251.src#1 branch
.. //depot/projects/ia64/share/timedef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/ia64/sys/alpha/alpha/db_instruction.h#3 integrate
.. //depot/projects/ia64/sys/alpha/alpha/db_trace.c#7 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dump_machdep.c#6 integrate
.. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#11 integrate
.. //depot/projects/ia64/sys/alpha/alpha/machdep.c#39 integrate
.. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#18 integrate
.. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#28 integrate
.. //depot/projects/ia64/sys/alpha/include/kse.h#2 delete
.. //depot/projects/ia64/sys/alpha/include/sysarch.h#3 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux_proto.h#6 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux_syscall.h#5 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux_sysent.c#5 integrate
.. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#14 integrate
.. //depot/projects/ia64/sys/alpha/linux/syscalls.conf#2 integrate
.. //depot/projects/ia64/sys/alpha/linux/syscalls.master#5 integrate
.. //depot/projects/ia64/sys/alpha/osf1/osf1_proto.h#4 integrate
.. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#18 integrate
.. //depot/projects/ia64/sys/alpha/osf1/osf1_syscall.h#3 integrate
.. //depot/projects/ia64/sys/alpha/osf1/osf1_sysent.c#3 integrate
.. //depot/projects/ia64/sys/alpha/osf1/syscalls.conf#2 integrate
.. //depot/projects/ia64/sys/alpha/osf1/syscalls.master#3 integrate
.. //depot/projects/ia64/sys/alpha/pci/apecs.c#6 integrate
.. //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#6 integrate
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#19 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#32 integrate
.. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#13 integrate
.. //depot/projects/ia64/sys/amd64/ia32/ia32_signal.c#7 integrate
.. //depot/projects/ia64/sys/amd64/include/kse.h#2 delete
.. //depot/projects/ia64/sys/amd64/include/param.h#8 integrate
.. //depot/projects/ia64/sys/amd64/include/profile.h#3 integrate
.. //depot/projects/ia64/sys/amd64/include/sysarch.h#4 integrate
.. //depot/projects/ia64/sys/amd64/isa/atpic.c#3 integrate
.. //depot/projects/ia64/sys/amd64/isa/icu.h#3 integrate
.. //depot/projects/ia64/sys/boot/alpha/common/conf.c#3 integrate
.. //depot/projects/ia64/sys/boot/alpha/common/main.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/OSFpal.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/alpha_module.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/bootinfo.c#3 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/delay.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/devicename.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/elf_freebsd.c#3 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/getsecs.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/prom.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/reboot.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/srmdisk.c#3 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/srmnet.c#2 integrate
.. //depot/projects/ia64/sys/boot/alpha/libalpha/time.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/abort.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/arcconsole.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/arcdisk.c#4 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/bootinfo.c#3 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/delay.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/devicename.c#3 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/elf_freebsd.c#3 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/module.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/prom.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/setjmperr.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/lib/time.c#2 integrate
.. //depot/projects/ia64/sys/boot/arc/loader/conf.c#3 integrate
.. //depot/projects/ia64/sys/boot/arc/loader/main.c#2 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#12 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/devicename.c#2 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/efifpswa.c#6 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#6 integrate
.. //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#9 integrate
.. //depot/projects/ia64/sys/boot/forth/beastie.4th#6 integrate
.. //depot/projects/ia64/sys/boot/i386/boot0/Makefile#5 integrate
.. //depot/projects/ia64/sys/boot/i386/boot0/boot0sio.s#2 integrate
.. //depot/projects/ia64/sys/boot/ofw/common/main.c#3 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/devicename.c#6 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/elf_freebsd.c#6 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/libofw.h#4 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_console.c#3 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_copy.c#3 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_disk.c#7 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_memory.c#3 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_module.c#2 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_net.c#4 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_time.c#2 integrate
.. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm.c#4 integrate
.. //depot/projects/ia64/sys/boot/powerpc/loader/conf.c#4 integrate
.. //depot/projects/ia64/sys/boot/powerpc/loader/metadata.c#4 integrate
.. //depot/projects/ia64/sys/boot/powerpc/loader/start.c#3 integrate
.. //depot/projects/ia64/sys/boot/sparc64/boot1/boot1.c#7 integrate
.. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#15 integrate
.. //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#10 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_util.h#2 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/syscalls.conf#2 integrate
.. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/ia64/sys/compat/ia32/ia32_sysvec.c#5 integrate
.. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#28 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_misc.c#30 integrate
.. //depot/projects/ia64/sys/compat/linux/linux_socket.c#13 integrate
.. //depot/projects/ia64/sys/compat/ndis/cfg_var.h#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/kern_ndis.c#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/ndis_var.h#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/pe_var.h#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/subr_hal.c#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/ia64/sys/compat/ndis/subr_pe.c#2 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_proto.h#3 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#17 integrate
.. //depot/projects/ia64/sys/compat/svr4/syscalls.conf#2 integrate
.. //depot/projects/ia64/sys/compat/svr4/syscalls.master#2 integrate
.. //depot/projects/ia64/sys/conf/Makefile.alpha#10 integrate
.. //depot/projects/ia64/sys/conf/files#110 integrate
.. //depot/projects/ia64/sys/conf/files.i386#51 integrate
.. //depot/projects/ia64/sys/conf/kern.post.mk#39 integrate
.. //depot/projects/ia64/sys/conf/kern.pre.mk#25 integrate
.. //depot/projects/ia64/sys/conf/kmod.mk#30 integrate
.. //depot/projects/ia64/sys/conf/majors#32 integrate
.. //depot/projects/ia64/sys/conf/newvers.sh#10 integrate
.. //depot/projects/ia64/sys/conf/options.i386#25 integrate
.. //depot/projects/ia64/sys/conf/options.pc98#23 integrate
.. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#11 integrate
.. //depot/projects/ia64/sys/dev/acpica/Osd/OsdTable.c#4 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi.c#47 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#17 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#14 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#20 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_package.c#2 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#10 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#21 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#14 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpivar.h#23 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#11 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#16 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#13 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#9 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#17 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#14 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#11 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#11 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#14 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#12 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#15 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#14 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#9 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#8 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.seq#7 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_93cx6.c#5 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_inline.h#7 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#14 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#13 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#13 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic_osm_lib.c#1 branch
.. //depot/projects/ia64/sys/dev/aic7xxx/aic_osm_lib.h#1 branch
.. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.c#5 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#4 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_scan.l#6 integrate
.. //depot/projects/ia64/sys/dev/an/if_aironet_ieee.h#7 integrate
.. //depot/projects/ia64/sys/dev/an/if_an.c#28 integrate
.. //depot/projects/ia64/sys/dev/an/if_an_isa.c#9 integrate
.. //depot/projects/ia64/sys/dev/an/if_an_pccard.c#11 integrate
.. //depot/projects/ia64/sys/dev/an/if_an_pci.c#15 integrate
.. //depot/projects/ia64/sys/dev/an/if_anreg.h#11 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.c#47 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.h#18 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-card.c#17 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-cbus.c#8 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#30 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-disk.c#29 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-dma.c#32 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-isa.c#15 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#16 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.c#35 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.h#19 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-queue.c#8 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-raid.c#28 integrate
.. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#36 integrate
.. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#19 integrate
.. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#18 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#5 integrate
.. //depot/projects/ia64/sys/dev/bge/if_bge.c#45 integrate
.. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#23 integrate
.. //depot/projects/ia64/sys/dev/bktr/ioctl_bt848.h#2 integrate
.. //depot/projects/ia64/sys/dev/bktr/ioctl_meteor.h#2 integrate
.. //depot/projects/ia64/sys/dev/ciss/ciss.c#29 integrate
.. //depot/projects/ia64/sys/dev/drm/drmP.h#7 integrate
.. //depot/projects/ia64/sys/dev/drm/drm_bufs.h#6 integrate
.. //depot/projects/ia64/sys/dev/drm/drm_dma.h#7 integrate
.. //depot/projects/ia64/sys/dev/drm/drm_drv.h#13 integrate
.. //depot/projects/ia64/sys/dev/drm/drm_sysctl.h#6 integrate
.. //depot/projects/ia64/sys/dev/drm/mga_dma.c#7 integrate
.. //depot/projects/ia64/sys/dev/drm/mga_drv.h#6 integrate
.. //depot/projects/ia64/sys/dev/drm/r128.h#5 integrate
.. //depot/projects/ia64/sys/dev/drm/r128_cce.c#7 integrate
.. //depot/projects/ia64/sys/dev/drm/r128_drv.h#7 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 18:22:38 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CDC5616A4D1; Sun, 11 Jan 2004 18:22:37 -0800 (PST)
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 9D62516A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 18:22:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 80A8543D31
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 18:22:31 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C2MV0B087464
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 18:22:31 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C2MTlR087461
	for perforce@freebsd.org; Sun, 11 Jan 2004 18:22:29 -0800 (PST)
	(envelope-from imp@freebsd.org)
Date: Sun, 11 Jan 2004 18:22:29 -0800 (PST)
Message-Id: <200401120222.i0C2MTlR087461@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45183 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: Mon, 12 Jan 2004 02:22:38 -0000

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

Change 45183 by imp@imp_pacopaco on 2004/01/11 18:22:05

	Power branch: IFC @45176

Affected files ...

.. //depot/projects/power/sys/alpha/alpha/mp_machdep.c#4 integrate
.. //depot/projects/power/sys/alpha/include/sysarch.h#2 integrate
.. //depot/projects/power/sys/amd64/include/sysarch.h#3 integrate
.. //depot/projects/power/sys/boot/forth/beastie.4th#4 integrate
.. //depot/projects/power/sys/compat/ndis/kern_ndis.c#4 integrate
.. //depot/projects/power/sys/compat/ndis/ndis_var.h#4 integrate
.. //depot/projects/power/sys/compat/ndis/subr_ndis.c#4 integrate
.. //depot/projects/power/sys/conf/files.i386#4 integrate
.. //depot/projects/power/sys/conf/majors#6 integrate
.. //depot/projects/power/sys/conf/newvers.sh#4 integrate
.. //depot/projects/power/sys/conf/options.i386#5 integrate
.. //depot/projects/power/sys/dev/acpica/Osd/OsdTable.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi.c#9 integrate
.. //depot/projects/power/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-all.c#5 integrate
.. //depot/projects/power/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/power/sys/dev/ata/ata-card.c#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/power/sys/dev/ata/ata-disk.c#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-dma.c#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-isa.c#3 integrate
.. //depot/projects/power/sys/dev/ata/ata-lowlevel.c#5 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.c#5 integrate
.. //depot/projects/power/sys/dev/ata/ata-queue.c#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-raid.c#4 integrate
.. //depot/projects/power/sys/dev/ata/atapi-cd.c#6 integrate
.. //depot/projects/power/sys/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/power/sys/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/power/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/power/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/power/sys/dev/firewire/firewire.c#8 integrate
.. //depot/projects/power/sys/dev/firewire/fwohci.c#8 integrate
.. //depot/projects/power/sys/dev/firewire/if_fwe.c#7 integrate
.. //depot/projects/power/sys/dev/firewire/sbp.c#7 integrate
.. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/power/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/power/sys/dev/pci/pci_pci.c#6 integrate
.. //depot/projects/power/sys/dev/pci/pci_user.c#5 integrate
.. //depot/projects/power/sys/dev/pci/pcib_private.h#4 integrate
.. //depot/projects/power/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/power/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_vnops.c#4 integrate
.. //depot/projects/power/sys/geom/geom_subr.c#4 integrate
.. //depot/projects/power/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate
.. //depot/projects/power/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/power/sys/gnu/dev/sound/pci/emu10k1.h#2 integrate
.. //depot/projects/power/sys/i386/acpica/acpi_toshiba.c#1 branch
.. //depot/projects/power/sys/i386/conf/NOTES#7 integrate
.. //depot/projects/power/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/power/sys/i386/include/sysarch.h#2 integrate
.. //depot/projects/power/sys/ia64/include/sysarch.h#3 integrate
.. //depot/projects/power/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/power/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/power/sys/kern/kern_sig.c#7 integrate
.. //depot/projects/power/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/power/sys/kern/sys_pipe.c#5 integrate
.. //depot/projects/power/sys/kern/tty.c#3 integrate
.. //depot/projects/power/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/power/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/power/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/power/sys/modules/Makefile#6 integrate
.. //depot/projects/power/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/power/sys/modules/acpi/acpi_toshiba/Makefile#1 branch
.. //depot/projects/power/sys/modules/ida/Makefile#1 branch
.. //depot/projects/power/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/power/sys/modules/sound/driver/emu10k1/Makefile#2 integrate
.. //depot/projects/power/sys/net/if_atmsubr.c#3 integrate
.. //depot/projects/power/sys/net/route.c#6 integrate
.. //depot/projects/power/sys/netgraph/ng_ether.c#4 integrate
.. //depot/projects/power/sys/netinet/ip_icmp.c#6 integrate
.. //depot/projects/power/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/power/sys/netinet/tcp.h#2 integrate
.. //depot/projects/power/sys/netinet/tcp_input.c#7 integrate
.. //depot/projects/power/sys/netinet/tcp_subr.c#8 integrate
.. //depot/projects/power/sys/netinet/tcp_usrreq.c#5 integrate
.. //depot/projects/power/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/power/sys/netinet6/in6.c#4 integrate
.. //depot/projects/power/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/power/sys/netinet6/in6_pcb.c#5 integrate
.. //depot/projects/power/sys/pc98/i386/machdep.c#5 integrate
.. //depot/projects/power/sys/pci/if_dc.c#8 integrate
.. //depot/projects/power/sys/pci/if_dcreg.h#6 integrate
.. //depot/projects/power/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/power/sys/sparc64/include/ofw_machdep.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/ofw_machdep.c#4 integrate
.. //depot/projects/power/sys/sys/filedesc.h#3 integrate
.. //depot/projects/power/sys/vm/vm_contig.c#4 integrate
.. //depot/projects/power/sys/vm/vm_extern.h#3 integrate
.. //depot/projects/power/sys/vm/vm_kern.c#6 integrate
.. //depot/projects/power/sys/vm/vm_page.c#5 integrate

Differences ...

==== //depot/projects/power/sys/alpha/alpha/mp_machdep.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -351,7 +351,7 @@
 	boot_cpu_id = PCPU_GET(cpuid);
 	KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id,
 	    ("cpu_mp_probe() called on non-primary CPU"));
-	all_cpus = 1 << boot_cpu_id;
+	all_cpus = PCPU_GET(cpumask);
 
 	mp_ncpus = 1;
 
@@ -413,12 +413,12 @@
 		all_cpus |= (1 << i);
 		mp_ncpus++;
 	}
-	PCPU_SET(other_cpus, all_cpus & ~(1 << boot_cpu_id));
+	PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
 
 	for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) {
 		if (i == boot_cpu_id)
 			continue;
-		if (all_cpus & (1 << i))
+		if (!CPU_ABSENT(i))
 			smp_start_secondary(i);
 	}
 }
@@ -476,7 +476,7 @@
 void
 ipi_self(u_int64_t ipi)
 {
-	ipi_selected(1 << PCPU_GET(cpuid), ipi);
+	ipi_selected(PCPU_GET(cpumask), ipi);
 }
 
 /*
@@ -489,7 +489,7 @@
 	u_int64_t ipi;
 	int cpumask;
 
-	cpumask = 1 << PCPU_GET(cpuid);
+	cpumask = PCPU_GET(cpumask);
 
 	CTR1(KTR_SMP, "smp_handle_ipi(), ipis=%lx", ipis);
 	while (ipis) {

==== //depot/projects/power/sys/alpha/include/sysarch.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.6 2002/03/20 18:58:45 obrien Exp $
+ * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.7 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -52,6 +52,7 @@
 
 __BEGIN_DECLS
 int		alpha_sethae(u_int64_t);
+int		sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/power/sys/amd64/include/sysarch.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.21 2003/10/23 06:06:14 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.22 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -50,9 +50,10 @@
 
 __BEGIN_DECLS
 int amd64_get_fsbase(void **);
+int amd64_get_gsbase(void **);
 int amd64_set_fsbase(void *);
-int amd64_get_gsbase(void **);
 int amd64_set_gsbase(void *);
+int sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/power/sys/boot/forth/beastie.4th#4 (text+ko) ====

@@ -23,7 +23,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $
 
 marker task-beastie.4th
 
@@ -228,6 +228,7 @@
 				s" acpi_load" unsetenv
 				s" 1" s" hint.acpi.0.disabled" setenv
 				s" 1" s" loader.acpi_disabled_by_user" setenv
+				s" 1" s" hint.apic.0.disabled" setenv
 			then
 			s" 0" s" hw.ata.ata_dma" setenv
 			s" 0" s" hw.ata.atapi_dma" setenv

==== //depot/projects/power/sys/compat/ndis/kern_ndis.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.23 2004/01/07 06:15:56 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.25 2004/01/09 06:53:49 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -305,17 +305,17 @@
 	    "NDIS API Version", "0x00050001", CTLFLAG_RD);
 
 	/* Bus type (PCI, PCMCIA, etc...) */
-	sprintf(buf, "%d\n", (int)sc->ndis_iftype);
+	sprintf(buf, "%d", (int)sc->ndis_iftype);
 	ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
 
 	if (sc->ndis_res_io != NULL) {
-		sprintf(buf, "0x%lx\n", rman_get_start(sc->ndis_res_io));
+		sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
 		ndis_add_sysctl(sc, "IOBaseAddress",
 		    "Base I/O Address", buf, CTLFLAG_RD);
 	}
 
 	if (sc->ndis_irq != NULL) {
-		sprintf(buf, "%lu\n", rman_get_start(sc->ndis_irq));
+		sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
 		ndis_add_sysctl(sc, "InterruptNumber",
 		    "Interrupt Number", buf, CTLFLAG_RD);
 	}
@@ -600,6 +600,7 @@
 	priv = &(*p)->np_private;
 	priv->npp_totlen = m0->m_pkthdr.len;
         priv->npp_packetooboffset = offsetof(ndis_packet, np_oob);
+	priv->npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
 
 	for (m = m0; m != NULL; m = m->m_next) {
 		if (m->m_len == 0)

==== //depot/projects/power/sys/compat/ndis/ndis_var.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.12 2004/01/06 07:09:26 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.14 2004/01/09 06:53:49 wpaul Exp $
  */
 
 #ifndef _NDIS_VAR_H_
@@ -808,7 +808,7 @@
  */
 struct ndis_miniport_interrupt {
 	void			*ni_introbj;
-	ndis_spin_lock		ni_dpccountlock;
+	ndis_kspin_lock		ni_dpccountlock;
 	void			*ni_rsvd;
 	void			*ni_isrfunc;
 	void			*ni_dpcfunc;
@@ -919,6 +919,10 @@
 #define NDIS_FLAGS_SENT_AT_DPC                  0x00001000
 #define NDIS_FLAGS_USES_SG_BUFFER_LIST          0x00002000
 
+#define NDIS_PACKET_WRAPPER_RESERVED			0x3F
+#define NDIS_PACKET_CONTAINS_MEDIA_SPECIFIC_INFO	0x40
+#define NDIS_PACKET_ALLOCATED_BY_NDIS			0x80
+
 #define NDIS_PROTOCOL_ID_DEFAULT        0x00
 #define NDIS_PROTOCOL_ID_TCP_IP         0x02
 #define NDIS_PROTOCOL_ID_IPX            0x06
@@ -1157,6 +1161,14 @@
 
 TAILQ_HEAD(nte_head, ndis_timer_entry);
 
+struct ndis_fh {
+	void			*nf_vp;
+	void			*nf_map;
+	uint32_t		nf_maplen; 
+};
+
+typedef struct ndis_fh ndis_fh;
+
 /*
  * The miniport block is basically the internal NDIS handle. We need
  * to define this because, unfortunately, it is not entirely opaque

==== //depot/projects/power/sys/compat/ndis/subr_ndis.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.30 2004/01/07 19:26:47 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.32 2004/01/09 06:53:49 wpaul Exp $");
 
 /*
  * This file implements a translation layer between the BSD networking
@@ -65,6 +65,10 @@
 #include <sys/smp.h>
 #include <sys/queue.h>
 #include <sys/taskqueue.h>
+#include <sys/proc.h>
+#include <sys/namei.h>
+#include <sys/fcntl.h>
+#include <sys/vnode.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -100,7 +104,11 @@
 #define FUNC void(*)(void)
 
 static struct mtx ndis_interlock;
+static char ndis_filepath[MAXPATHLEN];
 
+SYSCTL_STRING(_hw, OID_AUTO, ndis_filepath, CTLFLAG_RW, ndis_filepath,
+        MAXPATHLEN, "Path used by NdisOpenFile() to search for files");
+
 __stdcall static void ndis_initwrap(ndis_handle,
 	ndis_driver_object *, void *, void *);
 __stdcall static ndis_status ndis_register_miniport(ndis_handle,
@@ -272,6 +280,7 @@
 {
 	mtx_init(&ndis_interlock, "ndislock", MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE | MTX_DUPOK);
+	strcpy(ndis_filepath, "/compat/ndis");
 
 	return(0);
 }
@@ -1539,6 +1548,13 @@
 	pkt->np_private.npp_packetooboffset =
 	    offsetof(ndis_packet, np_oob);
 
+	/*
+	 * We must initialize the packet flags correctly in order
+	 * for the NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO() and
+	 * NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO() to work correctly.
+	 */
+	pkt->np_private.npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
+
 	*packet = pkt;
 
 	head->np_private.npp_count++;
@@ -2323,12 +2339,50 @@
 	ndis_physaddr		highestaddr;
 {
 	char			*afilename = NULL;
+	struct thread		*td = curthread;
+	struct nameidata	nd;
+	int			flags, error;
+	struct vattr		vat;
+	struct vattr		*vap = &vat;
+	ndis_fh			*fh;
+	char			path[MAXPATHLEN];
 
-	ndis_unicode_to_ascii(filename->nus_buf, filename->nus_len, &afilename);
-	printf("ndis_open_file(\"%s\", %ju)\n", afilename,
-	    highestaddr.np_quad);
+	ndis_unicode_to_ascii(filename->nus_buf,
+	    filename->nus_len, &afilename);
+
+	sprintf(path, "%s/%s", ndis_filepath, afilename);
 	free(afilename, M_DEVBUF);
-	*status = NDIS_STATUS_FILE_NOT_FOUND;
+
+	fh = malloc(sizeof(ndis_fh), M_TEMP, M_NOWAIT);
+	if (fh == NULL) {
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+
+	mtx_lock(&Giant);
+	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td);
+
+	flags = FREAD;
+	error = vn_open(&nd, &flags, 0, -1);
+	if (error) {
+		mtx_unlock(&Giant);
+		*status = NDIS_STATUS_FILE_NOT_FOUND;
+		free(fh, M_TEMP);
+		return;
+	}
+
+	NDFREE(&nd, NDF_ONLY_PNBUF);
+
+	/* Get the file size. */
+	VOP_GETATTR(nd.ni_vp, vap, NOCRED, td);
+	VOP_UNLOCK(nd.ni_vp, 0, td);
+	mtx_unlock(&Giant);
+
+	fh->nf_vp = nd.ni_vp;
+	fh->nf_map = NULL;
+	*filehandle = fh;
+	*filelength = fh->nf_maplen = vap->va_size & 0xFFFFFFFF;
+	*status = NDIS_STATUS_SUCCESS;
 	return;
 }
 
@@ -2338,8 +2392,46 @@
 	void			**mappedbuffer;
 	ndis_handle		filehandle;
 {
+	ndis_fh			*fh;
+	struct thread		*td = curthread;
+	int			error, resid;
 
-	*status = NDIS_STATUS_ALREADY_MAPPED;
+	if (filehandle == NULL) {
+		*status = NDIS_STATUS_FAILURE;
+		return;
+	}
+
+	fh = (ndis_fh *)filehandle;
+
+	if (fh->nf_vp == NULL) {
+		*status = NDIS_STATUS_FAILURE;
+		return;
+	}
+
+	if (fh->nf_map != NULL) {
+		*status = NDIS_STATUS_ALREADY_MAPPED;
+		return;
+	}
+
+	fh->nf_map = malloc(fh->nf_maplen, M_DEVBUF, M_NOWAIT);
+
+	if (fh->nf_map == NULL) {
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+
+	mtx_lock(&Giant);
+	error = vn_rdwr(UIO_READ, fh->nf_vp, fh->nf_map, fh->nf_maplen, 0,
+	    UIO_SYSSPACE, 0, td->td_ucred, NOCRED, &resid, td);
+	mtx_unlock(&Giant);
+
+	if (error)
+		*status = NDIS_STATUS_FAILURE;
+	else {
+		*status = NDIS_STATUS_SUCCESS;
+		*mappedbuffer = fh->nf_map;
+	}
+
 	return;
 }
 
@@ -2347,6 +2439,14 @@
 ndis_unmap_file(filehandle)
 	ndis_handle		filehandle;
 {
+	ndis_fh			*fh;
+	fh = (ndis_fh *)filehandle;
+
+	if (fh->nf_map == NULL)
+		return;
+	free(fh->nf_map, M_DEVBUF);
+	fh->nf_map = NULL;
+
 	return;
 }
 
@@ -2354,6 +2454,28 @@
 ndis_close_file(filehandle)
 	ndis_handle		filehandle;
 {
+	struct thread		*td = curthread;
+	ndis_fh			*fh;
+
+	if (filehandle == NULL)
+		return;
+
+	fh = (ndis_fh *)filehandle;
+	if (fh->nf_map != NULL) {
+		free(fh->nf_map, M_DEVBUF);
+		fh->nf_map = NULL;
+	}
+
+	if (fh->nf_vp == NULL)
+		return;
+
+	mtx_lock(&Giant);
+	vn_close(fh->nf_vp, FREAD, td->td_ucred, td);
+	mtx_unlock(&Giant);
+
+	fh->nf_vp = NULL;
+	free(fh, M_DEVBUF);
+
 	return;
 }
 

==== //depot/projects/power/sys/conf/files.i386#4 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.i386,v 1.460 2003/12/11 22:34:36 wpaul Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.461 2004/01/11 19:18:38 njl Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -168,6 +168,7 @@
 geom/geom_mbr_enc.c		standard
 i386/acpica/OsdEnvironment.c	optional	acpi
 i386/acpica/acpi_machdep.c	optional	acpi
+i386/acpica/acpi_toshiba.c	optional	acpi_toshiba acpi
 i386/acpica/acpi_wakeup.c	optional	acpi
 acpi_wakecode.h			optional	acpi			\
 	dependency 	"$S/i386/acpica/acpi_wakecode.S"		\

==== //depot/projects/power/sys/conf/majors#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/majors,v 1.186 2003/12/13 18:12:57 phk Exp $
+# $FreeBSD: src/sys/conf/majors,v 1.187 2004/01/11 06:24:34 rwatson Exp $
 #
 # This list is semi-obsoleted by DEVFS, but for now it still contains
 # the current allocation of device major numbers.
@@ -118,7 +118,6 @@
 115	dag		University of Waikato DAG network capture boards
 117	*acd		ATAPI CDROM
 119	*ast		ATAPI tape
-120	aud		Audit Device <rwatson@FreeBSD.org>
 121	onew		Dallas Semiconductor One-Wire bus <phk@freebsd.org>
 122	*uhid		USB HID devices <n_hibma>
 123	*fb		frame buffer

==== //depot/projects/power/sys/conf/newvers.sh#4 (text+ko) ====

@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.57 2003/12/07 03:56:12 scottl Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.60 2004/01/11 14:13:29 ru Exp $
 
 TYPE="FreeBSD"
 REVISION="5.2"
@@ -56,9 +56,9 @@
 do
 	if [ -r "$bsd_copyright" ]; then
 		COPYRIGHT=`sed \
-		    -e "s/\[year\]/$year/" \
-		    -e 's/\[your name here\]\.* /FreeBSD Inc./' \
-		    -e 's/\[your name\]\.*/FreeBSD Inc./' \
+		    -e "s/\[year\]/1992-$year/" \
+		    -e 's/\[your name here\]\.* /The FreeBSD Project./' \
+		    -e 's/\[your name\]\.*/The FreeBSD Project./' \
 		    -e '/\[id for your version control system, if any\]/d' \
 		    $bsd_copyright` 
 		break
@@ -68,8 +68,8 @@
 # no copyright found, use a dummy
 if [ X"$COPYRIGHT" = X ]; then
 	COPYRIGHT="/*
- * Copyright (c) $year
- *	FreeBSD Inc. All rights reserved.
+ * Copyright (c) 1992-$year The FreeBSD Project.
+ * All rights reserved.
  *
  */"
 fi

==== //depot/projects/power/sys/conf/options.i386#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.206 2003/12/30 07:28:53 bde Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.207 2004/01/08 17:13:10 wpaul Exp $
 # Options specific to the i386 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -27,6 +27,7 @@
 DEBUG_SVR4		opt_svr4.h
 PECOFF_SUPPORT		opt_dontuse.h
 PECOFF_DEBUG		opt_pecoff.h
+NDISAPI			opt_dontuse.h
 
 # Change KVM size.  Changes things all over the kernel.
 KVA_PAGES		opt_global.h

==== //depot/projects/power/sys/dev/acpica/Osd/OsdTable.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.3 2003/04/29 18:50:34 njl Exp $
+ *	$FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.4 2004/01/09 20:01:42 njl Exp $
  */
 
 /*
@@ -46,16 +46,19 @@
     ACPI_STRING                 *NewVal)
 {
     if (InitVal == NULL || NewVal == NULL)
-        return(AE_BAD_PARAMETER);
+	return (AE_BAD_PARAMETER);
 
     *NewVal = NULL;
-    if (strncmp(InitVal->Name, "_OS_", 4) == 0 &&
-      getenv_string("hw.acpi.os_name", acpi_os_name, sizeof(acpi_os_name))) {
-        printf("ACPI: Overriding _OS definition with \"%s\"\n", acpi_os_name);
-        *NewVal = acpi_os_name;
+
+    /* Allow both _OS and _OS_ to be overridden. */
+    if (strncmp(InitVal->Name, "_OS", 3) == 0 &&
+	getenv_string("hw.acpi.os_name", acpi_os_name, sizeof(acpi_os_name))) {
+
+	printf("ACPI: Overriding _OS definition with \"%s\"\n", acpi_os_name);
+	*NewVal = acpi_os_name;
     }
 
-    return(AE_OK);
+    return (AE_OK);
 }
 
 ACPI_STATUS
@@ -93,4 +96,3 @@
 
     return(AE_OK);
 }
-

==== //depot/projects/power/sys/dev/acpica/acpi.c#9 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.112 2003/12/26 15:42:13 jhb Exp $
+ *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.113 2004/01/09 21:04:28 njl Exp $
  */
 
 #include "opt_acpi.h"
@@ -268,8 +268,9 @@
 {
     ACPI_TABLE_HEADER	th;
     char		buf[20];
+    int			error;
+    struct sbuf		sb;
     ACPI_STATUS		status;
-    int			error;
     ACPI_LOCK_DECL;
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -288,8 +289,15 @@
 		      AcpiFormatException(status));
 	error = ENXIO;
     } else {
-	sprintf(buf, "%.6s %.8s", th.OemId, th.OemTableId);
-	device_set_desc_copy(dev, buf);
+	sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN);
+	sbuf_bcat(&sb, th.OemId, 6);
+	sbuf_trim(&sb);
+	sbuf_putc(&sb, ' ');
+	sbuf_bcat(&sb, th.OemTableId, 8);
+	sbuf_trim(&sb);
+	sbuf_finish(&sb);
+	device_set_desc_copy(dev, sbuf_data(&sb));
+	sbuf_delete(&sb);
 	error = 0;
     }
     ACPI_UNLOCK;

==== //depot/projects/power/sys/dev/an/if_an.c#4 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.57 2003/12/30 01:07:12 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.58 2004/01/10 03:02:04 ambrisko Exp $");
 
 /*
  * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
@@ -2729,27 +2729,6 @@
 			ifp->if_timer = 5;
 		}
 	} else { /* MPI-350 */
-/* HACK */
-		{
-			struct an_command	cmd_struct;
-			struct an_reply		reply;
-			/*
-			 * Allocate TX descriptor
-			 */
-			
-			bzero(&reply,sizeof(reply));
-			cmd_struct.an_cmd   = AN_CMD_ALLOC_DESC;
-			cmd_struct.an_parm0 = AN_DESCRIPTOR_TX;
-			cmd_struct.an_parm1 = AN_TX_DESC_OFFSET;
-			cmd_struct.an_parm2 = AN_MAX_TX_DESC;
-			if (an_cmd_struct(sc, &cmd_struct, &reply)) {
-				printf("an%d: failed to allocate TX "
-				    "descriptor\n", 
-				    sc->an_unit);
-				return;
-			}
-		}
-/* HACK */
 		while (sc->an_rdata.an_tx_empty ||
 		    idx != sc->an_rdata.an_tx_cons) {
 			IF_DEQUEUE(&ifp->if_snd, m0);

==== //depot/projects/power/sys/dev/ata/ata-all.c#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1998 - 2003 Søren Schmidt <sos@FreeBSD.org>
+ * Copyright (c) 1998 - 2004 Søren Schmidt <sos@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.198 2003/11/30 16:27:58 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.199 2004/01/11 22:08:34 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -40,7 +40,7 @@
 #include <sys/bus.h>
 #include <sys/bio.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
+#include <sys/sema.h>
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 #include <machine/stdarg.h>
@@ -60,13 +60,13 @@
 static struct cdevsw ata_cdevsw = {  
 	.d_ioctl =	ata_ioctl,
 	.d_name =	"ata",
-	.d_maj =	159,
 };
 
 /* prototypes */
 static void ata_shutdown(void *, int);
 static int ata_getparam(struct ata_device *, u_int8_t);
 static void ata_identify_devices(struct ata_channel *);
+static void ata_fail_requests(struct ata_channel *ch,struct ata_device *device);
 static void ata_boot_attach(void);
 static void bswap(int8_t *, int);
 static void btrim(int8_t *, int);
@@ -175,7 +175,6 @@
 ata_detach(device_t dev)
 {
     struct ata_channel *ch;
-    struct ata_request *request;
  
     if (!dev || !(ch = device_get_softc(dev)) || !ch->r_irq)
 	return ENXIO;
@@ -190,16 +189,9 @@
 #endif
 
     /* fail outstanding requests on this channel */
-    mtx_lock(&ch->queue_mtx);
-    while ((request = TAILQ_FIRST(&ch->ata_queue))) {
-	TAILQ_REMOVE(&ch->ata_queue, request, chain);
-	request->status = ATA_S_ERROR;
-	mtx_unlock(&ch->queue_mtx);
-	ata_finish(request);
-	mtx_lock(&ch->queue_mtx);
-    }
-    mtx_unlock(&ch->queue_mtx);
+    ata_fail_requests(ch, NULL);
 
+    /* flush cache and powerdown device */
     if (ch->device[MASTER].param) {
 	if (ch->device[MASTER].param->support.command2 & ATA_SUPPORT_FLUSHCACHE)
 	    ata_controlcmd(&ch->device[MASTER], ATA_FLUSHCACHE, 0, 0, 0);
@@ -237,42 +229,51 @@
 	return ENXIO;
 
     /* reset the HW */
-    ata_printf(ch, -1, "resetting devices ..\n");
+    if (bootverbose)
+	ata_printf(ch, -1, "reiniting channel ..\n");
     ATA_FORCELOCK_CH(ch, ATA_CONTROL);
+    ch->flags |= ATA_IMMEDIATE_MODE;
     ch->running = NULL;
     devices = ch->devices;
     ch->hw.reset(ch);
     ATA_UNLOCK_CH(ch);
 
+    if (bootverbose)
+	ata_printf(ch, -1, "resetting done ..\n");
+
     /* detach what left the channel during reset */
     if ((misdev = devices & ~ch->devices)) {
 	if ((misdev & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) &&
 	    ch->device[MASTER].detach) {
 	    if (request && (request->device == &ch->device[MASTER])) {
 		request->result = ENXIO;
-		request->flags |= ATA_R_DONE;
 		if (request->callback)
 		    (request->callback)(request);
 		else
-        	    wakeup(request);
+        	    sema_post(&request->done);
 	    }
 	    ch->device[MASTER].detach(&ch->device[MASTER]);
+	    ata_fail_requests(ch, &ch->device[MASTER]);
+	    free(ch->device[MASTER].param, M_ATA);
+	    ch->device[MASTER].param = NULL;
 	}
 	if ((misdev & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE)) &&
 	    ch->device[SLAVE].detach) {
 	    if (request && (request->device == &ch->device[SLAVE])) {
 		request->result = ENXIO;
-		request->flags |= ATA_R_DONE;
 		if (request->callback)
 		    (request->callback)(request);
 		else
-        	    wakeup(request);
+        	    sema_post(&request->done);
 	    }
 	    ch->device[SLAVE].detach(&ch->device[SLAVE]);
+	    ata_fail_requests(ch, &ch->device[SLAVE]);
+	    free(ch->device[SLAVE].param, M_ATA);
+	    ch->device[SLAVE].param = NULL;
 	}
     }
-
-    /* identify whats present on this channel now */
+    
+    /* identify what is present on the channel now */
     ata_identify_devices(ch);
 
     /* attach new devices that appeared during reset */
@@ -285,17 +286,26 @@
 	    ch->device[SLAVE].attach(&ch->device[SLAVE]);
     }
 
-    /* restore transfermode on devices */
-    if (ch->devices & (ATA_ATA_MASTER | ATA_ATAPI_MASTER))
+    /* restore device config and transfermode on devices */
+    if (ch->devices & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) {
+	if (ch->device[MASTER].config)
+	    ch->device[MASTER].config(&ch->device[MASTER]);
 	ch->device[MASTER].setmode(&ch->device[MASTER],ch->device[MASTER].mode);
-    if (ch->devices & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE))
+    }
+    if (ch->devices & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE)) {
+	if (ch->device[SLAVE].config)
+	    ch->device[SLAVE].config(&ch->device[SLAVE]);
 	ch->device[SLAVE].setmode(&ch->device[SLAVE], ch->device[SLAVE].mode);
+    }
 
 #ifdef DEV_ATAPICAM
     atapi_cam_reinit_bus(ch);
 #endif
 
-    printf("done\n");
+    if (bootverbose)
+	ata_printf(ch, -1, "device config done ..\n");
+    ch->flags &= ~ATA_IMMEDIATE_MODE;
+    ata_start(ch);
     return 0;
 }
 
@@ -543,21 +553,18 @@
 static int 
 ata_getparam(struct ata_device *atadev, u_int8_t command)
 {
-    struct ata_params *atacap;
     struct ata_request *request;
     int error = ENOMEM;
 
-    if (atadev->param)
-	atacap = atadev->param;
-    else
-	atacap = malloc(sizeof(struct ata_params), M_ATA, M_NOWAIT);
-    if (atacap) {
+    if (!atadev->param)
+	atadev->param = malloc(sizeof(struct ata_params), M_ATA, M_NOWAIT);
+    if (atadev->param) {
 	request = ata_alloc_request(); 
 	if (request) {
 	    request->device = atadev;
 	    request->u.ata.command = command;
-	    request->flags = (ATA_R_READ | ATA_R_QUIET);
-	    request->data = (caddr_t)atacap;
+	    request->flags = (ATA_R_READ | ATA_R_AT_HEAD);
+	    request->data = (caddr_t)atadev->param;
 	    request->timeout = 2;
 	    request->retries = 3;
 	    request->bytecount = sizeof(struct ata_params);
@@ -566,18 +573,19 @@
 		ata_queue_request(request);
 		if (!(error = request->result))
 		    break;
-		request->flags &= ~ATA_R_QUIET;
 		request->retries--;
 	    }
 	    ata_free_request(request);
 	}
-	if (!isprint(atacap->model[0]) || !isprint(atacap->model[1]))
+	if (!isprint(atadev->param->model[0]) ||
+	    !isprint(atadev->param->model[1]))
 	    error = ENXIO;
 	if (error) {
+	    free(atadev->param, M_ATA);
 	    atadev->param = NULL;
-	    free(atacap, M_ATA);
 	}
 	else {
+	    struct ata_params *atacap = atadev->param;
 #if BYTE_ORDER == BIG_ENDIAN
 	    int16_t *ptr;
 
@@ -598,7 +606,6 @@
 	    bswap(atacap->serial, sizeof(atacap->serial));
 	    btrim(atacap->serial, sizeof(atacap->serial));
 	    bpack(atacap->serial, atacap->serial, sizeof(atacap->serial));
-	    atadev->param = atacap;
 	    if (bootverbose)
 		ata_prtdev(atadev,
 			   "pio=0x%02x wdma=0x%02x udma=0x%02x cable=%spin\n",
@@ -694,6 +701,24 @@
     }
 }
 
+static void
+ata_fail_requests(struct ata_channel *ch, struct ata_device *device)
+{
+    struct ata_request *request;
+
+    mtx_lock(&ch->queue_mtx);
+    while ((request = TAILQ_FIRST(&ch->ata_queue))) {
+	if (device == NULL || request->device == device) {
+	    TAILQ_REMOVE(&ch->ata_queue, request, chain);
+	    request->result = ENXIO;
+	    mtx_unlock(&ch->queue_mtx);
+	    ata_finish(request);
+	    mtx_lock(&ch->queue_mtx);
+	}
+    }
+    mtx_unlock(&ch->queue_mtx);
+}
+
 static void 
 ata_boot_attach(void)
 {
@@ -964,12 +989,12 @@
 	printf("ata: malloc of delayed attach hook failed\n");
 	return;
     }
-
     ata_delayed_attach->ich_func = (void*)ata_boot_attach;
     if (config_intrhook_establish(ata_delayed_attach) != 0) {
 	printf("ata: config_intrhook_establish failed\n");
 	free(ata_delayed_attach, M_TEMP);
     }
+
     /* Register a handler to flush write caches on shutdown */
     if ((EVENTHANDLER_REGISTER(shutdown_post_sync, ata_shutdown,
 			       NULL, SHUTDOWN_PRI_DEFAULT)) == NULL)

==== //depot/projects/power/sys/dev/ata/ata-all.h#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1998 - 2003 Søren Schmidt <sos@FreeBSD.org>
+ * Copyright (c) 1998 - 2004 Søren Schmidt <sos@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.68 2003/11/28 19:01:28 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.69 2004/01/11 22:08:34 sos Exp $
  */
 
 /* ATA register defines */

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 19:13:35 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 994F616A4D1; Sun, 11 Jan 2004 19:13:35 -0800 (PST)
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 7205716A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:13:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5C16A43D31
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:13:34 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C3DY0B099299
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:13:34 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C3DX7Z099295
	for perforce@freebsd.org; Sun, 11 Jan 2004 19:13:33 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 19:13:33 -0800 (PST)
Message-Id: <200401120313.i0C3DX7Z099295@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45185 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: Mon, 12 Jan 2004 03:13:36 -0000

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

Change 45185 by rwatson@rwatson_paprika on 2004/01/11 19:13:25

	Logic fix.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ====

@@ -356,7 +356,7 @@
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
 	if (namei(&nd) != 0 || vn_fullpath_thread(td, nd.ni_vp, &dlep, &flep)
-	    == -1)
+	    != 0)
 		lep = linux_emul_path;
 	else
 		lep = dlep;

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 19:19:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0391D16A4D1; Sun, 11 Jan 2004 19:19:44 -0800 (PST)
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 D24D316A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:19:43 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 09F8043D1F
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:19:43 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C3Jg0B099661
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 19:19:42 -0800 (PST)
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C3JgK9099658
	for perforce@freebsd.org; Sun, 11 Jan 2004 19:19:42 -0800 (PST)
	(envelope-from imp@freebsd.org)
Date: Sun, 11 Jan 2004 19:19:42 -0800 (PST)
Message-Id: <200401120319.i0C3JgK9099658@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45187 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: Mon, 12 Jan 2004 03:19:44 -0000

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

Change 45187 by imp@imp_pacopaco on 2004/01/11 19:19:05

	integrate from newcard: fix the alignment issues.

Affected files ...

.. //depot/projects/power/sys/dev/pci/pci.c#9 integrate

Differences ...

==== //depot/projects/power/sys/dev/pci/pci.c#9 (text+ko) ====

@@ -1443,6 +1443,7 @@
 	struct resource_list_entry *rle;
 	struct resource *res;
 	uint32_t map, testval;
+	int mapsize;
 
 	/*
 	 * Weed out the bogons, and figure out how large the BAR/map is.
@@ -1467,7 +1468,10 @@
 	 * appropriate bar for that resource (this is the part
 	 * I'm not sure is good for 64-bit bars).
 	 */
-	count = 1 << pci_mapsize(testval);
+	mapsize = pci_mapsize(testval);
+	count = 1 << mapsize;
+	if (RF_ALIGNMENT(flags) < mapsize)
+	    flags = (flags & ~RF_ALIGNMENT_MASK) | RF_ALIGNMENT_LOG2(mapsize);
 	res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, type, rid,
 	    start, end, count, flags);
 	if (res == NULL) {

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 20:39:59 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D5BC16A4D1; Sun, 11 Jan 2004 20:39:59 -0800 (PST)
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 12FC516A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 20:39:59 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 404DF43D46
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 20:39:58 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C4dv0B017912
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 20:39:57 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C4dvn5017909
	for perforce@freebsd.org; Sun, 11 Jan 2004 20:39:57 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 11 Jan 2004 20:39:57 -0800 (PST)
Message-Id: <200401120439.i0C4dvn5017909@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45190 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: Mon, 12 Jan 2004 04:39:59 -0000

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

Change 45190 by jmallett@jmallett_oingo on 2004/01/11 20:39:57

	Mumble.

Affected files ...

.. //depot/projects/mips/sys/conf/ldscript.mips#4 edit

Differences ...

==== //depot/projects/mips/sys/conf/ldscript.mips#4 (text+ko) ====

@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /* Default linker script, for normal executables */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-bigmips")
 OUTPUT_ARCH(mips)
 ENTRY(start)
 SEARCH_DIR("/usr/lib");

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 21:30:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C58B016A4D1; Sun, 11 Jan 2004 21:30:16 -0800 (PST)
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 7FC8E16A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 21:30:16 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0839743D53
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 21:30:14 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C5UD0B034994
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 21:30:13 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C5UDvY034985
	for perforce@freebsd.org; Sun, 11 Jan 2004 21:30:13 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 21:30:13 -0800 (PST)
Message-Id: <200401120530.i0C5UDvY034985@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45191 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: Mon, 12 Jan 2004 05:30:17 -0000

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

Change 45191 by rwatson@rwatson_paprika on 2004/01/11 21:30:12

	More adaption for FreeBSDisms vs Machisms:
	- Use FreeBSD malloc() for audit record storage, path strings,
	  etc.  Eventually, we'll want to use a UMA zone for audit
	  records.  Note that, unlike on Darwin, with M_WAITOK, these
	  calls can't fail.
	- Use FreeBSD free() to release allocated memory.
	- Use td->td_proc in more places to get access to process
	  information.
	- Use td instead of p as argument to VFS calls.
	- Use td->td_ucred instead of p->p_ucred for credential
	  externalization.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#9 (text+ko) ====

@@ -31,6 +31,7 @@
 #include <sys/ipc.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
@@ -45,8 +46,7 @@
 #include <security/audit/kern_audit.h>
 #include <security/audit/bsm_klib.h>
 
-#define	kmem_alloc(map, ptrref, size)
-#define	kmem_free(map, ptr, size)
+MALLOC_DEFINE(M_AUDIT, "audit", "Audit event records");
 
 #ifdef AUDIT
 
@@ -136,24 +136,24 @@
 audit_free(struct kaudit_record *ar)
 {
 	if (ar->k_ar.ar_arg_upath1 != NULL) {
-		kmem_free(kernel_map, ar->k_ar.ar_arg_upath1, MAXPATHLEN);
+		free(ar->k_ar.ar_arg_upath1, M_AUDIT);
 	}
 	if (ar->k_ar.ar_arg_upath2 != NULL) {
-		kmem_free(kernel_map, ar->k_ar.ar_arg_upath2, MAXPATHLEN);
+		free(ar->k_ar.ar_arg_upath2, M_AUDIT);
 	}
 	if (ar->k_ar.ar_arg_kpath1 != NULL) {
-		kmem_free(kernel_map, ar->k_ar.ar_arg_kpath1, MAXPATHLEN);
+		free(ar->k_ar.ar_arg_kpath1, M_AUDIT);
 	}
 	if (ar->k_ar.ar_arg_kpath2 != NULL) {
-		kmem_free(kernel_map, ar->k_ar.ar_arg_kpath2, MAXPATHLEN);
+		free(ar->k_ar.ar_arg_kpath2, M_AUDIT);
 	}
 	if (ar->k_ar.ar_arg_text != NULL) {
-		kmem_free(kernel_map, ar->k_ar.ar_arg_text, MAXPATHLEN);
+		free(ar->k_ar.ar_arg_text, M_AUDIT);
 	}
 	if (ar->k_udata != NULL) {
-		kmem_free(kernel_map, ar->k_udata, ar->k_ulen);
+		free(ar->k_udata, M_AUDIT);
 	}
-	kmem_free(kernel_map, ar, sizeof(*ar));
+	free(ar, M_AUDIT);
 }
 
 static int
@@ -512,10 +512,7 @@
 	if (uap->length > MAX_AUDIT_RECORD_SIZE) 
 		return (EINVAL);
 
-	error = kmem_alloc(kernel_map, (vm_offset_t *)&rec, uap->length);
-	if (error != KERN_SUCCESS)
-		return(ENOMEM);
-
+	rec = malloc(uap->length, M_AUDIT, M_WAITOK);
 	error = copyin(uap->record, rec, uap->length);
 	if (error)
 		goto free_out;
@@ -535,7 +532,7 @@
 	return (0);
 
 free_out:
-	kmem_free(kernel_map, (vm_offset_t)rec, uap->length);
+	free(rec, M_AUDIT);
 	return (error);
 }
 
@@ -583,7 +580,7 @@
 	if (error)
 		return (error);
 
-	error = copyout((void *)&p->p_au->ai_auid, (void *)uap->auid, 
+	error = copyout((void *)&td->td_proc->p_au->ai_auid, (void *)uap->auid, 
 				sizeof(*uap->auid));
 	if (error)
 		return (error);
@@ -601,12 +598,12 @@
 	if (error)
 		return (error);
 
-	error = copyin((void *)uap->auid, (void *)&p->p_au->ai_auid, 
-				sizeof(p->p_au->ai_auid));
+	error = copyin((void *)uap->auid, (void *)&td->td_proc->p_au->ai_auid, 
+				sizeof(td->td_proc->p_au->ai_auid));
 	if (error)
 		return (error);
 
-	audit_arg_auid(p->p_au->ai_auid);
+	audit_arg_auid(td->td_proc->p_au->ai_auid);
 	return (0);
 }
 
@@ -622,7 +619,7 @@
 	error = suser(td);
 	if (error)
 		return (error);
-	error = copyout((void *)p->p_au, (void *)uap->auditinfo, 
+	error = copyout((void *)td->td_proc->p_au, (void *)uap->auditinfo, 
 				sizeof(*uap->auditinfo));
 	if (error)
 		return (error);
@@ -639,8 +636,8 @@
 	error = suser(td);
 	if (error)
 		return (error);
-	error = copyin((void *)uap->auditinfo, (void *)p->p_au, 
-				sizeof(*p->p_au));
+	error = copyin((void *)uap->auditinfo, (void *)td->td_proc->p_au, 
+				sizeof(*td->td_proc->p_au));
 	if (error)
 		return (error);
 
@@ -699,15 +696,15 @@
 	 */
 	if (uap->path != NULL) {
 		NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE,
-		    uap->path, p);
+		    uap->path, td);
 		flags = audit_open_flags;
 		error = vn_open(&nd, &flags, 0, -1);
 		if (error)
 			goto out;
-		VOP_UNLOCK(nd.ni_vp, 0, p);
+		VOP_UNLOCK(nd.ni_vp, 0, td);
 		vp = nd.ni_vp;
 		if (vp->v_type != VREG) {
-			vn_close(vp, audit_close_flags, td->td_ucred, p);
+			vn_close(vp, audit_close_flags, td->td_ucred, td);
 			error = EINVAL;
 			goto out;
 		}
@@ -769,25 +766,22 @@
 	 * safe to call from the non-BSD side of the house.
 	 * XXX: We may want to fail-stop if allocation fails.
 	 */
-	(void)kmem_alloc(kernel_map, &ar, sizeof(*ar));
-	if (ar == NULL)
-		return NULL;
-
+	ar = malloc(sizeof(*ar), M_AUDIT, M_WAITOK);
 	bzero(ar, sizeof(*ar));
 	ar->k_ar.ar_magic = AUDIT_RECORD_MAGIC;
 	ar->k_ar.ar_event = event;
 	nanotime(&ar->k_ar.ar_starttime);
 
 	/* Export the subject credential. */
-	cru2x(p->p_ucred, &ar->k_ar.ar_subj_cred);
+	cru2x(td->td_ucred, &ar->k_ar.ar_subj_cred);
 	ar->k_ar.ar_subj_ruid = td->td_ucred->cr_ruid;
 	ar->k_ar.ar_subj_rgid = td->td_ucred->cr_rgid;
 	ar->k_ar.ar_subj_egid = td->td_ucred->cr_groups[0];
-	ar->k_ar.ar_subj_auid = p->p_au->ai_auid;
+	ar->k_ar.ar_subj_auid = td->td_proc->p_au->ai_auid;
 	ar->k_ar.ar_subj_pid = td->td_proc->p_pid;
-	bcopy(p->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN);
-	bcopy(&p->p_au->ai_mask, &ar->k_ar.ar_subj_amask, 
-			sizeof(p->p_au->ai_mask));
+	bcopy(td->td_proc->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN);
+	bcopy(&td->td_proc->p_au->ai_mask, &ar->k_ar.ar_subj_amask, 
+			sizeof(td->td_proc->p_au->ai_mask));
 
 	return (ar);
 }
@@ -1183,11 +1177,8 @@
 	if (text == NULL)
 		return;	
 
-	if (ar->k_ar.ar_arg_text == NULL) {
-		kmem_alloc(kernel_map, &ar->k_ar.ar_arg_text, MAXPATHLEN);
-		if (ar->k_ar.ar_arg_text == NULL)
-			return;	
-	}
+	if (ar->k_ar.ar_arg_text == NULL)
+		ar->k_ar.ar_arg_text = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK);
 
 	strcpy(ar->k_ar.ar_arg_text, text);
 	ar->k_ar.ar_valid_arg |= ARG_TEXT;
@@ -1268,9 +1259,8 @@
 void
 audit_proc_init(struct proc *p)
 {
-	MALLOC_ZONE(p->p_au, struct auditinfo *, sizeof(*p->p_au), 
-			M_SUBPROC, M_WAITOK);
 
+	p->p_au = malloc(sizeof(*p->p_au), M_AUDIT, M_WAITOK);
 	bzero((void *)p->p_au, sizeof(*p->p_au));
 }
 
@@ -1283,13 +1273,12 @@
 void
 audit_proc_fork(struct proc *parent, struct proc *child)
 {
+
 	/* Always set up the audit information pointer as this function
 	 * should only be called when the proc is new. If proc structures
 	 * are ever cached and reused, then this behavior will leak memory.
 	 */
-	MALLOC_ZONE(child->p_au, struct auditinfo *, sizeof(*child->p_au), 
-			M_SUBPROC, M_WAITOK);
-
+	child->p_au = malloc(sizeof(*child->p_au), M_AUDIT, M_WAITOK);
 	bcopy(parent->p_au, child->p_au, sizeof(*child->p_au));
 }
 
@@ -1299,7 +1288,8 @@
 void
 audit_proc_free(struct proc *p)
 {
-	FREE_ZONE((void *)p->p_au, sizeof(*p->p_au), M_SUBPROC);
+
+	free(p->p_au, M_AUDIT);
 	p->p_au = NULL;
 }
 
@@ -1334,11 +1324,8 @@
 		pathp = &ar->k_ar.ar_arg_upath2;
 	}
 
-	if (*pathp == NULL) {
-		kmem_alloc(kernel_map, pathp, MAXPATHLEN);
-		if (*pathp == NULL)
-			return;
-	}
+	if (*pathp == NULL)
+		pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK);
 
 	canon_path(p, upath, *pathp);
 
@@ -1398,11 +1385,8 @@
 		vnp = &ar->k_ar.ar_arg_vnode2;
 	}
 
-	if (*pathp == NULL) {
-		kmem_alloc(kernel_map, pathp, MAXPATHLEN);
-		if (*pathp == NULL)
-			return;
-	}
+	if (*pathp == NULL)
+		pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK);
 
 	/* Copy the path looked up by the vn_getpath() function */
 	len = MAXPATHLEN;

From owner-p4-projects@FreeBSD.ORG  Sun Jan 11 22:08:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78D4D16A4D1; Sun, 11 Jan 2004 22:08:11 -0800 (PST)
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 43B9616A4CE
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 22:08:11 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4932643D53
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 22:08:09 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0C6880B043953
	for <perforce@freebsd.org>; Sun, 11 Jan 2004 22:08:08 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0C6881b043949
	for perforce@freebsd.org; Sun, 11 Jan 2004 22:08:08 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Jan 2004 22:08:08 -0800 (PST)
Message-Id: <200401120608.i0C6881b043949@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45192 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: Mon, 12 Jan 2004 06:08:11 -0000

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

Change 45192 by rwatson@rwatson_paprika on 2004/01/11 22:08:07

	Create a MALLOC_DECLARE() for M_AUDIT in kern_audit.h so M_AUDIT
	can be used in additional .c files.
	
	Remove kmem/mutex stubs from bsm_audit.c, bsm_token.c and use
	FreeBSD mutex   and malloc/free functions.  Much logical
	simplification.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#6 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#5 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#6 (text+ko) ====

@@ -30,6 +30,7 @@
 #include <sys/fcntl.h>
 #include <sys/ipc.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
@@ -43,14 +44,6 @@
 #include <security/audit/kern_audit.h>
 #include <security/audit/bsm_klib.h>
 
-/* XXXDARWIN */
-typedef struct mutex mutex_t;
-#define	kmem_alloc(map, ptrref, size)
-#define	kmem_free(map, ptr, size)
-#define	mutex_alloc(x)	(NULL)
-#define	mutex_lock(x)
-#define	mutex_unlock(x)
-
 /* The number of BSM records allocated. */
 static int bsm_rec_count = 0; 
 
@@ -65,7 +58,7 @@
 /*
  * Lock for serializing access to the list of audit records.
  */
-static mutex_t	*bsm_audit_mutex;
+static struct mtx	bsm_audit_mutex;
 
 /*
  * Initialize the BSM auditing subsystem.
@@ -75,7 +68,7 @@
 {
 	printf("BSM auditing present\n");
 	LIST_INIT(&bsm_free_q);
-	bsm_audit_mutex = mutex_alloc(ETAP_NO_TRACE);
+	mtx_init(&bsm_audit_mutex, "bsm_audit_mutex", NULL, MTX_DEF);
 }
 
 /*
@@ -94,38 +87,31 @@
 	/* 
 	 * Find an unused record, remove it from the free list, mark as used
 	 */  
-	mutex_lock(bsm_audit_mutex);
+	mtx_lock(&bsm_audit_mutex);
 	if (!LIST_EMPTY(&bsm_free_q)) {
 		rec = LIST_FIRST(&bsm_free_q);
 		LIST_REMOVE(rec, au_rec_q);
 	}
-	mutex_unlock(bsm_audit_mutex);
+	mtx_unlock(&bsm_audit_mutex);
 
 	if (rec == NULL) {
-		mutex_lock(bsm_audit_mutex);
+		mtx_lock(&bsm_audit_mutex);
 		if (bsm_rec_count >= MAX_AUDIT_RECORDS) {
 			/* XXX We need to increase size of MAX_AUDIT_RECORDS */
-			mutex_unlock(bsm_audit_mutex);
+			mtx_unlock(&bsm_audit_mutex);
 			return NULL;
 		}
-		mutex_unlock(bsm_audit_mutex);
+		mtx_unlock(&bsm_audit_mutex);
 			
 		/*
 		 * Create a new BSM kernel record.
 		 */
-		kmem_alloc(kernel_map, &rec, sizeof(*rec));
-		if(rec == NULL) {
-			return NULL;
-		}
-		kmem_alloc(kernel_map, &rec->data, 
-			   MAX_AUDIT_RECORD_SIZE * sizeof(u_char));
-		if((rec->data) == NULL) {
-			kmem_free(kernel_map, rec, sizeof(*rec));
-			return NULL;
-		}
-		mutex_lock(bsm_audit_mutex);
+		rec = malloc(sizeof(*rec), M_AUDIT, M_WAITOK);
+		rec->data = malloc(MAX_AUDIT_RECORD_SIZE * sizeof(u_char),
+		    M_AUDIT, M_WAITOK);
+		mtx_lock(&bsm_audit_mutex);
 		bsm_rec_count++;
-		mutex_unlock(bsm_audit_mutex);
+		mtx_unlock(&bsm_audit_mutex);
 	}
 	memset(rec->data, 0, MAX_AUDIT_RECORD_SIZE);
 
@@ -205,19 +191,19 @@
 	/* Free the token list */
 	while ((tok = TAILQ_FIRST(&rec->token_q))) {
 		TAILQ_REMOVE(&rec->token_q, tok, tokens);
-		kmem_free(kernel_map, tok->t_data, tok->len);
-		kmem_free(kernel_map, tok, sizeof(struct au_token));
+		free(tok->t_data, M_AUDIT);
+		free(tok, M_AUDIT);
 	}	
 
 	rec->used = 0;
 	rec->len = 0;	
 
-	mutex_lock(bsm_audit_mutex);
+	mtx_lock(&bsm_audit_mutex);
 
 	/* Add the record to the freelist */
 	LIST_INSERT_HEAD(&bsm_free_q, rec, au_rec_q);
 	
-	mutex_unlock(bsm_audit_mutex);
+	mtx_unlock(&bsm_audit_mutex);
 
 }
 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#5 (text+ko) ====

@@ -28,37 +28,26 @@
 #include <sys/bsm_token.h>      
 #include <sys/ipc.h>
 #include <sys/libkern.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
-#include <sys/un.h>      
+#include <sys/ucred.h>
+#include <sys/un.h>
 #include <sys/vnode.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#define	kmem_alloc(map, ptrref, size)
-#define	kmem_free(map, ptr, size)
+#include <security/audit/kern_audit.h>
 
-#define GET_TOKEN_AREA(tok, dptr, length) \
-        do {\
-                kmem_alloc(kernel_map, &tok, sizeof(*tok)); \
-                if(tok != NULL)\
-                {\
-                        tok->len = length;\
-                        kmem_alloc(kernel_map, &tok->t_data, \
-                                length * sizeof(u_char));\
-                        if((dptr = tok->t_data) == NULL)\
-                        {\
-                                kmem_free(kernel_map, tok, sizeof(*tok));\
-                                tok = NULL;\
-                        }\
-                        else\
-                        {\
-                                memset(dptr, 0, length);\
-                        }\
-                }\
-        }while(0)
-
+#define GET_TOKEN_AREA(tok, dptr, length)				\
+        do {								\
+		tok = malloc(sizeof(*tok), M_AUDIT, M_WAITOK);		\
+                tok->len = length;					\
+		dptr = tok->t_data = malloc(length * sizeof(u_char),	\
+		    M_AUDIT, M_WAITOK);					\
+		memset(tok->t_data, 0, length);				\
+	} while (0)
 
 
 /*

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#5 (text+ko) ====

@@ -85,6 +85,10 @@
 #define ARG_NONE	0x0000000000000000ULL
 #define ARG_ALL		0xFFFFFFFFFFFFFFFFULL
 
+#ifdef MALLOC_DECLARE
+MALLOC_DECLARE(M_AUDIT);
+#endif
+
 struct vnode_au_info {
 	mode_t		vn_mode;
 	uid_t		vn_uid;

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 15:42:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E68916A4D1; Mon, 12 Jan 2004 15:42:16 -0800 (PST)
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 E5D1916A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 15:42:15 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9477443D62
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 15:41:38 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0CNeb0B013474
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 15:40:37 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0CNebeA013466
	for perforce@freebsd.org; Mon, 12 Jan 2004 15:40:37 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 15:40:37 -0800 (PST)
Message-Id: <200401122340.i0CNebeA013466@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45234 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: Mon, 12 Jan 2004 23:42:16 -0000

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

Change 45234 by rwatson@rwatson_paprika on 2004/01/12 15:40:18

	Remove DARWIN_FOO now that the one remaining compile issue
	is the lack of a vn_getpath().

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#6 (text+ko) ====

@@ -749,10 +749,7 @@
 	}
 	if (vnp != NULL) {
 		len = MAXPATHLEN;
-#error DARWIN_FOO
-#ifdef DARWIN_FOO
 		vn_getpath(vnp, cpath, &len);
-#endif
 		/* The length returned by vn_getpath() is two greater than the 
 		 * number of characters in the string.
 		 */

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 15:57:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1682116A4D1; Mon, 12 Jan 2004 15:57:00 -0800 (PST)
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 E5A0A16A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 15:56:59 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1700F43D1F
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 15:56:59 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0CNuw0B017606
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 15:56:58 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0CNuwkN017603
	for perforce@freebsd.org; Mon, 12 Jan 2004 15:56:58 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 15:56:58 -0800 (PST)
Message-Id: <200401122356.i0CNuwkN017603@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45236 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: Mon, 12 Jan 2004 23:57:00 -0000

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

Change 45236 by rwatson@rwatson_paprika on 2004/01/12 15:56:16

	Make a copy of kern_audit.h to hold audit subsystem private
	definitions, such as the contents of the in-kernel audit
	record, which otherwise polutes the namespace of other
	kernel bits.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#1 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 16:03:39 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0103C16A4D1; Mon, 12 Jan 2004 16:03:38 -0800 (PST)
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 CCB6A16A4D0
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 16:03:38 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EDB3D43D31
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 16:02:05 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D0250B019091
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 16:02:05 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D025R1019082
	for perforce@freebsd.org; Mon, 12 Jan 2004 16:02:05 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 16:02:05 -0800 (PST)
Message-Id: <200401130002.i0D025R1019082@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45237 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: Tue, 13 Jan 2004 00:03:39 -0000

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

Change 45237 by rwatson@rwatson_paprika on 2004/01/12 16:01:31

	Keep kaudit_record and related structures kernel-internal;
	remove from kern_audit.h, and keep only in audit_private.h.
	Include audit_private.h in audit subsystem c files.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#10 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#2 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#7 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#7 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#6 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#10 (text+ko) ====

@@ -43,6 +43,7 @@
 #include <sys/un.h>
 #include <sys/vnode.h>
 
+#include <security/audit/audit_private.h>
 #include <security/audit/kern_audit.h>
 #include <security/audit/bsm_klib.h>
 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#2 (text+ko) ====

@@ -23,71 +23,8 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
-#ifndef _SYS_KERN_AUDIT_H
-#define	_SYS_KERN_AUDIT_H
-
-#ifdef _KERNEL
-
-/*
- * Audit subsystem condition flags.  The audit_enabled flag is set and
- * removed automatically as a result of configuring log files, and
- * can be observed but should not be directly manipulated.  The audit
- * suspension flag permits audit to be temporarily disabled without
- * reconfiguring the audit target.
- */
-extern int	audit_enabled;
-extern int	audit_suspended;
-
-#define BSM_SUCCESS		0
-#define BSM_FAILURE		1
-#define BSM_NOAUDIT		2
-
-/*
- * Define the masks for the audited arguments.
- */
-#define ARG_EUID	0x0000000000000001ULL
-#define ARG_RUID	0x0000000000000002ULL
-#define ARG_SUID	0x0000000000000004ULL
-#define ARG_EGID	0x0000000000000008ULL
-#define ARG_RGID	0x0000000000000010ULL
-#define ARG_SGID	0x0000000000000020ULL
-#define ARG_PID		0x0000000000000040ULL
-#define ARG_UID		0x0000000000000080ULL
-#define ARG_AUID	0x0000000000000100ULL
-#define ARG_GID		0x0000000000000200ULL
-#define ARG_FD		0x0000000000000400ULL
-#define UNUSED 		0x0000000000000800ULL
-#define ARG_FFLAGS	0x0000000000001000ULL
-#define ARG_MODE	0x0000000000002000ULL
-#define ARG_DEV		0x0000000000004000ULL
-#define ARG_ACCMODE	0x0000000000008000ULL
-#define ARG_CMODE	0x0000000000010000ULL
-#define ARG_MASK	0x0000000000020000ULL
-#define ARG_SIGNUM	0x0000000000040000ULL
-#define ARG_LOGIN	0x0000000000080000ULL
-#define ARG_SADDRINET	0x0000000000100000ULL
-#define ARG_SADDRINET6	0x0000000000200000ULL
-#define ARG_SADDRUNIX	0x0000000000400000ULL
-#define ARG_KPATH1	0x0000000000800000ULL
-#define ARG_KPATH2	0x0000000001000000ULL
-#define ARG_UPATH1	0x0000000002000000ULL
-#define ARG_UPATH2	0x0000000004000000ULL
-#define ARG_TEXT	0x0000000008000000ULL
-#define ARG_VNODE1	0x0000000010000000ULL
-#define ARG_VNODE2	0x0000000020000000ULL
-#define ARG_SVIPC_CMD	0x0000000040000000ULL
-#define ARG_SVIPC_PERM	0x0000000080000000ULL
-#define ARG_SVIPC_ID	0x0000000100000000ULL
-#define ARG_SVIPC_ADDR	0x0000000200000000ULL
-#define ARG_GROUPSET	0x0000000400000000ULL
-#define ARG_CMD		0x0000000800000000ULL
-#define ARG_SOCKINFO	0x0000001000000000ULL
-#define ARG_NONE	0x0000000000000000ULL
-#define ARG_ALL		0xFFFFFFFFFFFFFFFFULL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_AUDIT);
-#endif
+#ifndef _SYS_AUDIT_PRIVATE_H
+#define	_SYS_AUDIT_PRIVATE_H
 
 struct vnode_au_info {
 	mode_t		vn_mode;
@@ -186,110 +123,4 @@
 	TAILQ_ENTRY(kaudit_record)	k_q;
 };
 
-struct proc;
-struct vnode;
-struct componentname;
-
-void			 audit_abort(struct kaudit_record *ar);
-void			 audit_commit(struct kaudit_record *ar, int error, 
-					int retval);
-void			 audit_init(void);
-void			 audit_shutdown(void);
-
-struct kaudit_record	*audit_new(int event, struct proc *p,
-			    struct thread *td);
-
-void			 audit_syscall_enter(unsigned short code, 					    struct proc *proc, struct thread *td);
-void			 audit_syscall_exit(int error, struct proc *proc,
-			    struct thread *td);
-
-int			kaudit_to_bsm(struct kaudit_record *kar,
-					struct au_record **pau);
-
-int			bsm_rec_verify(caddr_t rec);
-
-/*
- * Kernel versions of the BSM audit record functions.
- */
-struct au_record 	*kau_open(void);
-int			kau_write(struct au_record *rec, token_t *m);
-int			kau_close(struct au_record *rec, 
-				 struct timespec *endtime, short event);
-void			kau_free(struct au_record *rec);
-void			kau_init(void);
-token_t			*kau_to_file(char *file, struct timeval *tv);
-token_t			*kau_to_header(struct timespec *ctime, int rec_size, 
-					au_event_t e_type, au_emod_t e_mod);
-token_t			*kau_to_header32(struct timespec *ctime, int rec_size, 
-					au_event_t e_type, au_emod_t e_mod);
-token_t			*kau_to_header64(struct timespec *ctime, int rec_size,
-					 au_event_t e_type, au_emod_t e_mod);
-/*
- * The remaining kernel functions are conditionally compiled in as they
- * are wrapped by a macro, and the macro should be the only place in 
- * the source tree where these functions are referenced.
- */
-#ifdef AUDIT
-void			 audit_arg_accmode(int mode);
-void			 audit_arg_cmode(int cmode);
-void			 audit_arg_fd(int fd);
-void			 audit_arg_fflags(int fflags);
-void			 audit_arg_gid(gid_t gid, gid_t egid, gid_t rgid, 
-					gid_t sgid);
-void			 audit_arg_uid(uid_t uid, uid_t euid, uid_t ruid, 
-					uid_t suid);
-void			 audit_arg_groupset(gid_t *gidset, u_int gidset_size);
-void			 audit_arg_login(char[MAXLOGNAME]);
-void			 audit_arg_mask(int mask);
-void			 audit_arg_mode(mode_t mode);
-void			 audit_arg_dev(int dev);
-void			 audit_arg_owner(uid_t uid, gid_t gid);
-void			 audit_arg_pid(pid_t pid);
-void			 audit_arg_signum(u_int signum);
-void			 audit_arg_socket(int sodomain, int sotype, 
-						int soprotocol);
-void			 audit_arg_sockaddr(struct proc *p, 
-						struct sockaddr *so);
-void			 audit_arg_auid(uid_t auid);
-void			 audit_arg_upath(struct proc *p, char *upath, 
-					 u_int64_t flags);
-void			 audit_arg_vnpath(struct vnode *vp, u_int64_t flags);
-void			 audit_arg_text(char *text);
-void			 audit_arg_cmd(int cmd);
-void			 audit_arg_svipc_cmd(int cmd);
-void			 audit_arg_svipc_perm(struct ipc_perm *perm);
-void			 audit_arg_svipc_id(int id);
-void			 audit_arg_svipc_addr(void *addr);
-
-void			 audit_proc_init(struct proc *p);
-void			 audit_proc_fork(struct proc *parent, 
-					 struct proc *child);
-void			 audit_proc_free(struct proc *p);
-
-/*
- * Define a macro to wrap the audit_arg_* calls by checking the global
- * audit_enabled flag before performing the actual call.
- */
-#define	AUDIT_ARG(op, args...)	do {					\
-	if (audit_enabled)						\
-		audit_arg_ ## op (args);				\
-	} while (0)
-
-#define AUDIT_CMD(audit_cmd)	do {					\
-	if (audit_enabled) {						\
-		audit_cmd;						\
-	}								\
-	} while (0)
-
-#else /* !AUDIT */
-#define	AUDIT_ARG(op, args...)	do {					\
-	} while (0)
-
-#define	AUDIT_CMD(audit_cmd)	do {					\
-	} while (0)
-
-#endif /* AUDIT */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_KERN_AUDIT_H */
+#endif /* !_SYS_AUDIT_PRIVATE_H */

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#7 (text+ko) ====

@@ -41,6 +41,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
+#include <security/audit/audit_private.h>
 #include <security/audit/kern_audit.h>
 #include <security/audit/bsm_klib.h>
 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#7 (text+ko) ====

@@ -36,6 +36,7 @@
 #include <sys/ucred.h>
 #include <sys/vnode.h>
 
+#include <security/audit/audit_private.h>
 #include <security/audit/kern_audit.h>
 #include <security/audit/bsm_klib.h>
 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#6 (text+ko) ====

@@ -89,103 +89,7 @@
 MALLOC_DECLARE(M_AUDIT);
 #endif
 
-struct vnode_au_info {
-	mode_t		vn_mode;
-	uid_t		vn_uid;
-	gid_t		vn_gid;
-	udev_t		vn_dev;
-	long		vn_fsid;
-	long		vn_fileid;
-	long		vn_gen;
-};
-
-struct groupset {
-	gid_t	gidset[NGROUPS];
-	u_int	gidset_size;
-};
-
-struct socket_info {
-	int 	sodomain;
-	int	sotype;
-	int	soprotocol;
-};
-
-struct xucred;
-struct sockaddr;
-struct ipc_perm;
-struct audit_record {
-	/* Audit record header. */
-	u_int32_t		ar_magic;
-	int			ar_event;
-	int			ar_retval; /* value returned to the process */
-	int			ar_errno;  /* return status of system call */
-	struct timespec		ar_starttime;
-	struct timespec		ar_endtime;
-	u_int64_t		ar_valid_arg;  /* Bitmask of valid arguments */
-
-	/* Audit subject information. */
-	struct xucred			ar_subj_cred;
-	uid_t				ar_subj_ruid;
-	gid_t				ar_subj_rgid;
-	gid_t				ar_subj_egid;
-	uid_t				ar_subj_auid; /* Audit user ID */
-	pid_t				ar_subj_asid; /* Audit session ID */
-	pid_t				ar_subj_pid;
-	struct au_tid			ar_subj_term;	
-	char				ar_subj_comm[MAXCOMLEN + 1];
-	struct au_mask			ar_subj_amask;
-
-	/* Operation arguments. */
-	uid_t				ar_arg_euid;
-	uid_t				ar_arg_ruid;
-	uid_t				ar_arg_suid;
-	gid_t				ar_arg_egid;
-	gid_t				ar_arg_rgid;
-	gid_t				ar_arg_sgid;
-	pid_t				ar_arg_pid;
-	uid_t				ar_arg_uid;
-	uid_t				ar_arg_auid;
-	gid_t				ar_arg_gid;
-	struct groupset			ar_arg_groups;
-	int				ar_arg_fd;
-	int				ar_arg_fflags;
-	mode_t				ar_arg_mode;
-	int				ar_arg_dev;
-	int				ar_arg_accmode;
-	int				ar_arg_cmode;
-	int				ar_arg_mask;
-	u_int				ar_arg_signum;
-	char				ar_arg_login[MAXLOGNAME];
-	struct sockaddr			ar_arg_sockaddr;
-	struct socket_info		ar_arg_sockinfo;
-	char				*ar_arg_upath1;
-	char				*ar_arg_upath2;
-	char				*ar_arg_kpath1;
-	char				*ar_arg_kpath2;
-	char				*ar_arg_text;
-	struct au_mask			ar_arg_amask;
-	struct vnode_au_info		ar_arg_vnode1;
-	struct vnode_au_info		ar_arg_vnode2;
-	int				ar_arg_cmd;
-	int				ar_arg_svipc_cmd;
-	struct ipc_perm			ar_arg_svipc_perm;
-	int				ar_arg_svipc_id;
-	void *				ar_arg_svipc_addr;
-};
-
-/*
- * In-kernel version of audit record; the basic record plus queue meta-data.
- * This record can also have a pointer set to some opaque data that will
- * be passed through to the audit writing mechanism.
- */
-struct kaudit_record {
-	struct audit_record		k_ar;
-	caddr_t				k_udata;    /* user data */	
-	u_int				k_ulen;     /* user data length */	
-	struct uthread			*k_uthread; /* thread we are auditing */
-	TAILQ_ENTRY(kaudit_record)	k_q;
-};
-
+struct kaudit_record;
 struct proc;
 struct vnode;
 struct componentname;

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 19:21:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA52D16A4D1; Mon, 12 Jan 2004 19:21:12 -0800 (PST)
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 7E35116A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 19:21:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 694A243D1F
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 19:21:09 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D3L90B070601
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 19:21:09 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D3L8lD070595
	for perforce@freebsd.org; Mon, 12 Jan 2004 19:21:08 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 19:21:08 -0800 (PST)
Message-Id: <200401130321.i0D3L8lD070595@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45242 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: Tue, 13 Jan 2004 03:21:13 -0000

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

Change 45242 by rwatson@rwatson_paprika on 2004/01/12 19:20:40

	Use unsigned lengths for audit system call arguments;
	avoid nastiness in userspace.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#4 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#4 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#4 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#4 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#4 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#4 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#4 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#4 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#4 (text+ko) ====

@@ -639,17 +639,17 @@
 			    int attrnamespace, void *data, size_t nbytes); }
 439	STD	BSD	{ ssize_t extattr_list_link(const char *path, \
 			    int attrnamespace, void *data, size_t nbytes); }
-440	MSTD	BSD	{ int audit(const void *record, int length); }
-441	MSTD	BSD	{ int auditon(int cmd, void *data, int length); }
+440	MSTD	BSD	{ int audit(const void *record, u_int length); }
+441	MSTD	BSD	{ int auditon(int cmd, void *data, u_int length); }
 442	MSTD	BSD	{ int auditsvc(int fd, int limit); }
 443	MSTD	BSD	{ int getauid(uid_t *auid); }
 444	MSTD	BSD	{ int setauid(uid_t *auid); }
 445	MSTD	BSD	{ int getaudit(struct auditinfo *auditinfo); }
 446	MSTD	BSD	{ int setaudit(struct auditinfo *auditinfo); }
 447	MSTD	BSD	{ int getaudit_addr(struct auditinfo_addr \
-			    *auditinfo_addr, int length); }
+			    *auditinfo_addr, u_int length); }
 448	MSTD	BSD	{ int setaudit_addr(struct auditinfo_addr \
-			    *auditinfo_addr, int length); }
+			    *auditinfo_addr, u_int length); }
 449	MSTD	BSD	{ int auditctl(char *path); }
 
 ; Please copy any additions and changes to the following compatability tables:

==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#4 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#4 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#4 (text+ko) ====

@@ -1286,12 +1286,12 @@
 };
 struct audit_args {
 	char record_l_[PADL_(const void *)]; const void * record; char record_r_[PADR_(const void *)];
-	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
+	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
 };
 struct auditon_args {
 	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
 	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
+	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
 };
 struct auditsvc_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@@ -1311,11 +1311,11 @@
 };
 struct getaudit_addr_args {
 	char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)];
-	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
+	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
 };
 struct setaudit_addr_args {
 	char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)];
-	char length_l_[PADL_(int)]; int length; char length_r_[PADR_(int)];
+	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
 };
 struct auditctl_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 20:46:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9EA1716A4D1; Mon, 12 Jan 2004 20:46:00 -0800 (PST)
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 77E4E16A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:46:00 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A896943D41
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:45:51 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D4jp0B089809
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:45:51 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D4jpVX089806
	for perforce@freebsd.org; Mon, 12 Jan 2004 20:45:51 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 20:45:51 -0800 (PST)
Message-Id: <200401130445.i0D4jpVX089806@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45243 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: Tue, 13 Jan 2004 04:46:01 -0000

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

Change 45243 by rwatson@rwatson_paprika on 2004/01/12 20:45:19

	Forward declare structures depended on in in-kernel audit
	APIs.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#7 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#7 (text+ko) ====

@@ -134,6 +134,10 @@
  * the source tree where these functions are referenced.
  */
 #ifdef AUDIT
+struct ipc_perm;
+struct proc;
+struct sockaddr;
+struct vnode;
 void			 audit_arg_accmode(int mode);
 void			 audit_arg_cmode(int cmode);
 void			 audit_arg_fd(int fd);

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 20:48:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 67C8416A4CE; Mon, 12 Jan 2004 20:48:01 -0800 (PST)
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 42AB516A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:48:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B670A43D69
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:47:54 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D4ls0B095619
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:47:54 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D4lsgf095616
	for perforce@freebsd.org; Mon, 12 Jan 2004 20:47:54 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 20:47:54 -0800 (PST)
Message-Id: <200401130447.i0D4lsgf095616@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45244 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: Tue, 13 Jan 2004 04:48:01 -0000

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

Change 45244 by rwatson@rwatson_paprika on 2004/01/12 20:47:05

	Even more forward declaration of structures.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#8 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#8 (text+ko) ====

@@ -89,6 +89,7 @@
 MALLOC_DECLARE(M_AUDIT);
 #endif
 
+struct au_record;
 struct kaudit_record;
 struct proc;
 struct vnode;

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 20:48:58 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0113216A4D1; Mon, 12 Jan 2004 20:48:57 -0800 (PST)
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 D0ED516A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:48:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 919AF43D39
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:48:56 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D4mu0B095648
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:48:56 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D4muEu095645
	for perforce@freebsd.org; Mon, 12 Jan 2004 20:48:56 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 20:48:56 -0800 (PST)
Message-Id: <200401130448.i0D4muEu095645@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45245 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: Tue, 13 Jan 2004 04:48:58 -0000

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

Change 45245 by rwatson@rwatson_paprika on 2004/01/12 20:48:51

	Move in-kernel BSM APIs to audit private include file, to avoid
	exposing token_t to the remainder of the kernel.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#3 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#9 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#3 (text+ko) ====

@@ -123,4 +123,21 @@
 	TAILQ_ENTRY(kaudit_record)	k_q;
 };
 
+/*
+ * Kernel versions of the BSM audit record functions.
+ */
+struct au_record 	*kau_open(void);
+int			kau_write(struct au_record *rec, token_t *m);
+int			kau_close(struct au_record *rec, 
+				 struct timespec *endtime, short event);
+void			kau_free(struct au_record *rec);
+void			kau_init(void);
+token_t			*kau_to_file(char *file, struct timeval *tv);
+token_t			*kau_to_header(struct timespec *ctime, int rec_size, 
+					au_event_t e_type, au_emod_t e_mod);
+token_t			*kau_to_header32(struct timespec *ctime, int rec_size, 
+					au_event_t e_type, au_emod_t e_mod);
+token_t			*kau_to_header64(struct timespec *ctime, int rec_size,
+					 au_event_t e_type, au_emod_t e_mod);
+
 #endif /* !_SYS_AUDIT_PRIVATE_H */

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#9 (text+ko) ====

@@ -114,22 +114,6 @@
 int			bsm_rec_verify(caddr_t rec);
 
 /*
- * Kernel versions of the BSM audit record functions.
- */
-struct au_record 	*kau_open(void);
-int			kau_write(struct au_record *rec, token_t *m);
-int			kau_close(struct au_record *rec, 
-				 struct timespec *endtime, short event);
-void			kau_free(struct au_record *rec);
-void			kau_init(void);
-token_t			*kau_to_file(char *file, struct timeval *tv);
-token_t			*kau_to_header(struct timespec *ctime, int rec_size, 
-					au_event_t e_type, au_emod_t e_mod);
-token_t			*kau_to_header32(struct timespec *ctime, int rec_size, 
-					au_event_t e_type, au_emod_t e_mod);
-token_t			*kau_to_header64(struct timespec *ctime, int rec_size,
-					 au_event_t e_type, au_emod_t e_mod);
-/*
  * The remaining kernel functions are conditionally compiled in as they
  * are wrapped by a macro, and the macro should be the only place in 
  * the source tree where these functions are referenced.

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 20:55:08 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4F1916A519; Mon, 12 Jan 2004 20:55:07 -0800 (PST)
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 AD82216A517
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:55:07 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B543A43D45
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:55:04 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D4t40B097662
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:55:04 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D4t4ug097659
	for perforce@freebsd.org; Mon, 12 Jan 2004 20:55:04 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 20:55:04 -0800 (PST)
Message-Id: <200401130455.i0D4t4ug097659@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45246 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: Tue, 13 Jan 2004 04:55:08 -0000

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

Change 45246 by rwatson@rwatson_paprika on 2004/01/12 20:54:08

	Modify vn_fullpath() memory ownership model: the caller now
	allocates the memory, rather than vn_fullpath() allocating it.
	This brings us closer to Apple's vn_getpath(), and permits the
	storage for a path in the audit system to be owned by the
	audit system.  Also prevents a lot of extra mallocs in procfs...

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#4 edit
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_map.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/vfs_cache.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/vnode.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ====

@@ -349,17 +349,19 @@
 	struct mount *mp;
 	const char *lep;
 	char *dlep, *flep, *mntto, *mntfrom, *fstype;
+	char *fullpath, *lep;
 	size_t lep_len;
 	int error;
 
 	/* resolve symlinks etc. in the emulation tree prefix */
+	fullpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
-	if (namei(&nd) != 0 || vn_fullpath_thread(td, nd.ni_vp, &dlep, &flep)
-	    != 0)
+	if (namei(&nd) != 0 || vn_fullpath_proc(td, nd.ni_vp, fullpath,
+	    MAXPATHLEN) != 0)
 		lep = linux_emul_path;
 	else
-		lep = dlep;
+		lep = fullpath;
 	lep_len = strlen(lep);
 
 	mtx_lock(&mountlist_mtx);
@@ -403,8 +405,7 @@
 		sbuf_printf(sb, " 0 0\n");
 	}
 	mtx_unlock(&mountlist_mtx);
-	if (flep != NULL)
-		free(flep, M_TEMP);
+	free(fullpath);
 	return (error);
 }
 
@@ -737,13 +738,14 @@
 static int
 linprocfs_doproccwd(PFS_FILL_ARGS)
 {
-	char *fullpath = "unknown";
-	char *freepath = NULL;
+	char *fullpath;
 
-	vn_fullpath_thread(td, p->p_fd->fd_cdir, &fullpath, &freepath);
-	sbuf_printf(sb, "%s", fullpath);
-	if (freepath)
-		free(freepath, M_TEMP);
+	fullpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	if (vn_fullpath_proc(td, p->p_fd->fd_cdir, fullpath, MAXPATHLEN) == 0)
+		sbuf_printf(sb, "%s", fullpath);
+	else
+		sbuf_printf(sb, "unknown");
+	free(fullpath, M_TEMP);
 	return (0);
 }
 
@@ -754,14 +756,15 @@
 linprocfs_doprocroot(PFS_FILL_ARGS)
 {
 	struct vnode *rvp;
-	char *fullpath = "unknown";
-	char *freepath = NULL;
+	char *fullpath;
 
+	fullpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	rvp = jailed(p->p_ucred) ? p->p_fd->fd_jdir : p->p_fd->fd_rdir;
-	vn_fullpath_thread(td, rvp, &fullpath, &freepath);
-	sbuf_printf(sb, "%s", fullpath);
-	if (freepath)
-		free(freepath, M_TEMP);
+	if (vn_fullpath_proc(td, rvp, fullpath, MAXPATHLEN) == 0)
+		sbuf_printf(sb, "%s", fullpath);
+	else
+		sbuf_printf(sb, "unknown");
+	free(fullpath);
 	return (0);
 }
 
@@ -828,12 +831,12 @@
 	vm_map_entry_t entry;
 	vm_object_t obj, tobj, lobj;
 	vm_ooffset_t off = 0;
-	char *name = "", *freename = NULL;
+	char *name = "", *fullpath;
 	size_t len;
 	ino_t ino;
 	int ref_count, shadow_count, flags;
 	int error;
-	
+
 	PROC_LOCK(p);
 	error = p_candebug(td, p);
 	PROC_UNLOCK(p);
@@ -846,6 +849,7 @@
 	if (uio->uio_offset != 0)
 		return (0);
 	
+	fullpath = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	error = 0;
 	if (map != &curthread->td_proc->p_vmspace->vm_map)
 		vm_map_lock_read(map);
@@ -864,9 +868,12 @@
 			VM_OBJECT_LOCK(lobj);
 			off = IDX_TO_OFF(lobj->size);
 			if (lobj->type == OBJT_VNODE && lobj->handle) {
-				vn_fullpath_thread(td,
-				    (struct vnode *)lobj->handle, &name,
-				    &freename);
+				if (vn_fullpath_proc(td,
+				    (struct vnode *)lobj->handle, fullpath,
+				    MAXPATHLEN) == 0)
+					name = fullpath;
+				else
+					name = "";
 				ino = ((struct vnode *)
 				    lobj->handle)->v_cachedid;
 			}
@@ -898,8 +905,6 @@
 		    *name ? "     " : "",
 		    name
 		    );
-		if (freename)
-			free(freename, M_TEMP);
 		len = strlen(mebuffer);
 		if (len > uio->uio_resid)
 			len = uio->uio_resid; /*
@@ -912,7 +917,7 @@
 	}
 	if (map != &curthread->td_proc->p_vmspace->vm_map)
 		vm_map_unlock_read(map);
-	
+	free(fullpath);
 	return (error);
 }	
 	

==== //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs.c#3 (text+ko) ====

@@ -67,13 +67,14 @@
 int
 procfs_doprocfile(PFS_FILL_ARGS)
 {
-	char *fullpath = "unknown";
-	char *freepath = NULL;
+	char *path;
 
-	vn_fullpath_thread(td, p->p_textvp, &fullpath, &freepath);
-	sbuf_printf(sb, "%s", fullpath);
-	if (freepath)
-		free(freepath, M_TEMP);
+	path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+	if (vn_fullpath_proc(td, p->p_textvp, path, MAXPATHLEN) == 0)
+		sbuf_printf(sb, "%s", path);
+	else
+		sbuf_printf(sb, "unknown");
+	free(path, M_TEMP);
 	return (0);
 }
 

==== //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_map.c#3 (text+ko) ====

@@ -80,7 +80,7 @@
 	pmap_t pmap = vmspace_pmap(p->p_vmspace);
 	vm_map_entry_t entry;
 	char mebuffer[MEBUFFERSIZE];
-	char *fullpath, *freepath;
+	char *path, *thepath;
 
 	GIANT_REQUIRED;
 
@@ -95,7 +95,8 @@
 
 	if (uio->uio_offset != 0)
 		return (0);
-	
+
+	path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	error = 0;
 	if (map != &curthread->td_proc->p_vmspace->vm_map)
 		vm_map_lock_read(map);
@@ -128,26 +129,30 @@
 		for (lobj = tobj = obj; tobj; tobj = tobj->backing_object)
 			lobj = tobj;
 
-		freepath = NULL;
-		fullpath = "-";
+		path = NULL;
 		if (lobj) {
 			switch(lobj->type) {
 			default:
 			case OBJT_DEFAULT:
+				thepath = "-";
 				type = "default";
 				break;
 			case OBJT_VNODE:
 				type = "vnode";
-				vn_fullpath_thread(td,
-				    (struct vnode *)lobj->handle,
-				    &fullpath,
-				    &freepath);
+				if (vn_fullpath_proc(td,
+				    (struct vnode *)lobj->handle, path,
+				    MAXPATHLEN) == 0)
+					thepath = path;
+				else
+					thepath = "unknown";
 				break;
 			case OBJT_SWAP:
 				type = "swap";
+				thepath = "-";
 				break;
 			case OBJT_DEVICE:
 				type = "device";
+				thepath = "-";
 				break;
 			}
 			
@@ -156,6 +161,7 @@
 			shadow_count = obj->shadow_count;
 		} else {
 			type = "none";
+			thepath = "-";
 			flags = 0;
 			ref_count = 0;
 			shadow_count = 0;
@@ -175,11 +181,8 @@
 			ref_count, shadow_count, flags,
 			(entry->eflags & MAP_ENTRY_COW)?"COW":"NCOW",
 			(entry->eflags & MAP_ENTRY_NEEDS_COPY)?"NC":"NNC",
-			type, fullpath);
+			type, thepath);
 
-		if (freepath != NULL)
-			free(freepath, M_TEMP);
-
 		len = strlen(mebuffer);
 		if (len > uio->uio_resid) {
 			error = EFBIG;
@@ -191,6 +194,7 @@
 	}
 	if (map != &curthread->td_proc->p_vmspace->vm_map)
 		vm_map_unlock_read(map);
+	free(path, M_TEMP);
 	
 	return (error);
 }

==== //depot/projects/trustedbsd/audit2/sys/kern/vfs_cache.c#3 (text+ko) ====

@@ -927,10 +927,10 @@
  * cache (if available)
  */
 int
-vn_fullpath(struct vnode *optional_root, struct vnode *vn, char **retbuf,
-    char **freebuf)
+vn_fullpath(struct vnode *optional_root, struct vnode *vn, char *buf,
+    u_int buflen)
 {
-	char *bp, *buf;
+	char *bp;
 	int i, slash_prefixed;
 	struct namecache *ncp;
 	struct vnode *vp;
@@ -941,8 +941,7 @@
 		return (ENODEV);
 	if (vn == NULL)
 		return (EINVAL);
-	buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
-	bp = buf + MAXPATHLEN - 1;
+	bp = buf + buflen - 1;
 	*bp = '\0';
 	slash_prefixed = 0;
 	error = 0;
@@ -1000,25 +999,21 @@
 		*--bp = '/';
 	}
 	numfullpathfound++;
-	*retbuf = bp;
-	*freebuf = buf;
 out2:
 	CACHE_UNLOCK();
 out1:
-	if (error)
-		free(buf, M_TEMP);
-	return (0);
+	return (error);
 }
 
 /*
  * Perform a vn_fullpath() operation relative to a specific process's
  * root.  The process is specified using a thread, which for locking
- * reasons, should be curthread.  A better API might pass in a reference
- * to struct filedesc * to specify what root to use.
+ * reasons, (must) should be curthread.  A better API might pass in a
+ * reference to struct filedesc * to specify what root to use.
  */
 int
-vn_fullpath_thread(struct thread *td, struct vnode *vn, char **retbuf,
-    char **freebuf)
+vn_fullpath_proc(struct thread *td, struct vnode *vn, char *buf,
+    u_int buflen)
 {
 	struct filedesc *fdp;
 	int error;
@@ -1031,7 +1026,7 @@
 	 */
 	fdp = td->td_proc->p_fd;
 	FILEDESC_LOCK(fdp);
-	error = vn_fullpath(fdp->fd_rdir, vn, retbuf, freebuf);
+	error = vn_fullpath(fdp->fd_rdir, vn, buf, buflen);
 	FILEDESC_UNLOCK(fdp);
 	return (error);
 }

==== //depot/projects/trustedbsd/audit2/sys/sys/vnode.h#3 (text+ko) ====

@@ -609,12 +609,12 @@
 int	lease_check(struct vop_lease_args *ap);
 int	spec_vnoperate(struct vop_generic_args *);
 int	speedup_syncer(void);
-#define textvp_fullpath(p, rb, rfb) \
-	vn_fullpath_thread(FIRST_THREAD_IN_PROC(p), (p)->p_textvp, rb, rfb)
+#define textvp_fullpath(p, rb, rbl) \
+	vn_fullpath_proc(FIRST_THREAD_IN_PROC(p), (p)->p_textvp, rb, rbl)
 int	vn_fullpath(struct vnode *optional_root, struct vnode *vn,
-	    char **retbuf, char **freebuf);
-int	vn_fullpath_thread(struct thread *td, struct vnode *vn,
-	    char **retbuf, char **freebuf);
+	    char *buf, u_int buflen);
+int	vn_fullpath_proc(struct thread *td, struct vnode *vn,
+	    char *buf, u_int buflen);
 int	vaccess(enum vtype type, mode_t file_mode, uid_t uid, gid_t gid,
 	    mode_t acc_mode, struct ucred *cred, int *privused);
 int	vaccess_acl_posix1e(enum vtype type, uid_t file_uid,

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 20:56:20 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 618FC16A4D1; Mon, 12 Jan 2004 20:56:20 -0800 (PST)
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 3B5EE16A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:56:20 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9FEA143D60
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:56:06 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D4u60B097780
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 20:56:06 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D4u6Y7097777
	for perforce@freebsd.org; Mon, 12 Jan 2004 20:56:06 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 20:56:06 -0800 (PST)
Message-Id: <200401130456.i0D4u6Y7097777@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45247 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: Tue, 13 Jan 2004 04:56:20 -0000

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

Change 45247 by rwatson@rwatson_paprika on 2004/01/12 20:55:37

	Set up process audit state when creating the first process.  
	Destroy audit state when destroying a process.  When forking a
	process, initialize the new process and inherit state.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/kern/init_main.c#2 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_exit.c#2 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_fork.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/kern/init_main.c#2 (text+ko) ====

@@ -49,6 +49,7 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/audit.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
@@ -76,6 +77,8 @@
 
 #include <machine/cpu.h>
 
+#include <security/audit/kern_audit.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
@@ -394,6 +397,9 @@
 	p->p_ucred->cr_uidinfo = uifind(0);
 	p->p_ucred->cr_ruidinfo = uifind(0);
 	p->p_ucred->cr_prison = NULL;	/* Don't jail it. */
+#ifdef AUDIT
+	audit_proc_init(p);
+#endif
 #ifdef MAC
 	mac_create_proc0(p->p_ucred);
 #endif

==== //depot/projects/trustedbsd/audit2/sys/kern/kern_exit.c#2 (text+ko) ====

@@ -74,6 +74,8 @@
 #include <sys/ktrace.h>
 #endif
 
+#include <security/audit/kern_audit.h>
+
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_param.h>
@@ -181,6 +183,10 @@
 	p->p_flag |= P_WEXIT;
 	PROC_UNLOCK(p);
 
+#ifdef AUDIT
+	audit_syscall_exit(0, p, td);
+#endif
+
 	/* Are we a task leader? */
 	if (p == p->p_leader) {
 		mtx_lock(&ppeers_lock);
@@ -682,6 +688,9 @@
 			 */
 			crfree(p->p_ucred);
 			p->p_ucred = NULL;
+#ifdef AUDIT
+			audit_proc_free(p);
+#endif
 			pargs_drop(p->p_args);
 			p->p_args = NULL;
 			sigacts_free(p->p_sigacts);

==== //depot/projects/trustedbsd/audit2/sys/kern/kern_fork.c#2 (text+ko) ====

@@ -70,6 +70,8 @@
 #include <sys/jail.h>
 #include <sys/sx.h>
 
+#include <security/audit/kern_audit.h>
+
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
@@ -507,6 +509,9 @@
 	mtx_unlock_spin(&sched_lock);
 	p2->p_ucred = crhold(td->td_ucred);
 	td2->td_ucred = crhold(p2->p_ucred);	/* XXXKSE */
+#ifdef AUDIT
+	audit_proc_fork(p1, p2);
+#endif
 
 	pargs_hold(p2->p_args);
 

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 21:13:34 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FDB316A4D1; Mon, 12 Jan 2004 21:13:34 -0800 (PST)
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 2B38C16A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:13:34 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CFA8E43D5C
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:13:28 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D5DS0B002930
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:13:28 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D5DSBu002924
	for perforce@freebsd.org; Mon, 12 Jan 2004 21:13:28 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 21:13:28 -0800 (PST)
Message-Id: <200401130513.i0D5DSBu002924@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45249 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: Tue, 13 Jan 2004 05:13:34 -0000

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

Change 45249 by rwatson@rwatson_paprika on 2004/01/12 21:13:10

	- Pass thread instead of socket in audit_arg_sockaddr(),
	  audit_arg_upath(), canon_path().
	- Use vn_fullpath() instead of vn_getpath() in canon_path() and
	  audit_arg_vnpath().  Note that we can resolve the XXX relating
	  to lack of locking assertions, because FreeBSD has those.
	- Note the improper locking in canon_path() for file descriptors
	  and vnodes.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#11 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#8 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#4 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#10 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#11 (text+ko) ====

@@ -1127,12 +1127,12 @@
 }
 
 void
-audit_arg_sockaddr(struct proc *p, struct sockaddr *so)
+audit_arg_sockaddr(struct thread *td, struct sockaddr *so)
 {
 	struct kaudit_record *ar;
 
 	ar = currecord();
-	if (ar == NULL || p == NULL || so == NULL)
+	if (ar == NULL || td == NULL || so == NULL)
 		return;
 
 	bcopy(so, &ar->k_ar.ar_arg_sockaddr, sizeof(ar->k_ar.ar_arg_sockaddr));
@@ -1144,7 +1144,7 @@
 		ar->k_ar.ar_valid_arg |= ARG_SADDRINET6;
 		break;
 	case AF_UNIX:
-		audit_arg_upath(p, ((struct sockaddr_un *)so)->sun_path, 
+		audit_arg_upath(td, ((struct sockaddr_un *)so)->sun_path, 
 				ARG_UPATH1);
 		ar->k_ar.ar_valid_arg |= ARG_SADDRUNIX;
 		break;
@@ -1301,12 +1301,12 @@
  * freed when the audit record is freed.
  */
 void
-audit_arg_upath(struct proc *p, char *upath, u_int64_t flags)
+audit_arg_upath(struct thread *td, char *upath, u_int64_t flags)
 {
 	struct kaudit_record *ar;
 	char **pathp;
 
-	if (p == NULL || upath == NULL) 
+	if (td == NULL || upath == NULL) 
 		return;		/* nothing to do! */
 
 	if ((flags & (ARG_UPATH1 | ARG_UPATH2)) == 0)
@@ -1328,7 +1328,7 @@
 	if (*pathp == NULL)
 		pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK);
 
-	canon_path(p, upath, *pathp);
+	canon_path(td, upath, *pathp);
 
 	if (flags & ARG_UPATH1)
 		ar->k_ar.ar_valid_arg |= ARG_UPATH1;
@@ -1356,7 +1356,6 @@
 	struct kaudit_record *ar;
 	struct vattr vattr;
 	int error;
-	int len;
 	char **pathp;
 	struct vnode_au_info *vnp;
 	struct thread *td;
@@ -1389,9 +1388,15 @@
 	if (*pathp == NULL)
 		pathp = malloc(MAXPATHLEN, M_AUDIT, M_WAITOK);
 
-	/* Copy the path looked up by the vn_getpath() function */
-	len = MAXPATHLEN;
-	vn_getpath(vp, *pathp, &len);
+	/*
+	 * Copy the path looked up by the vn_getpath() function.
+	 *
+	 * XXX: Note that in FreeBSD, vn_fullpath() is unreliable, so if
+	 * it fails, we just have a zero-length string.  Perhaps instead
+	 * we should not include a path token...?
+	 */
+	if (vn_fullpath(NULL, vp, *pathp, MAXPATHLEN) != 0)
+		(*pathp)[0] = '\0';
 	if (flags & ARG_VNODE1)
 		ar->k_ar.ar_valid_arg |= ARG_KPATH1;
 	else

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#8 (text+ko) ====

@@ -722,14 +722,17 @@
  * written to the audit log. So we will leave the filename starting
  * with '/' in the audit log in this case.
  */
-void canon_path(struct proc *p, char *path, char *cpath)
+void canon_path(struct thread *td, char *path, char *cpath)
 {
 	char *bufp;
 	int len;
 	struct vnode *vnp;
 	struct filedesc *fdp;
 
-	fdp = p->p_fd;
+	/*
+	 * XXX: file descriptor locking!
+	 */
+	fdp = td->td_proc->p_fd;
 	bufp = path;
 	if (*(path) == '/') {
 		while (*(bufp) == '/') 
@@ -749,13 +752,21 @@
 		bufp = path;
 	}
 	if (vnp != NULL) {
-		len = MAXPATHLEN;
-		vn_getpath(vnp, cpath, &len);
-		/* The length returned by vn_getpath() is two greater than the 
-		 * number of characters in the string.
+		/*
+		 * XXX: Should lock vnode!
+		 */
+		/*
+		 * XXX: vn_fullpath() on FreeBSD is "less reliable"
+		 * than vn_getpath() on Darwin, so this will need more
+		 * attention in the future.  Also, the question and
+		 * string bounding here seems a bit questionable and
+		 * will also require attention.
 		 */
-		if (len < MAXPATHLEN)
-			cpath[len-2] = '/';	
+		vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY, td);
+		if (vn_fullpath(NULL, vnp, cpath, MAXPATHLEN) != 0)
+			cpath[0] = '\0';
+		VOP_UNLOCK(vnp, 0, td);
+		len = strlen(cpath);
 		strncpy(cpath + len-1, bufp, MAXPATHLEN - len);
 	} else {
 		strncpy(cpath, bufp, MAXPATHLEN);

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#4 (text+ko) ====

@@ -34,7 +34,7 @@
 int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf);
 au_event_t flags_to_openevent(int oflags);
 void fill_vattr(struct vattr *v, struct vnode_au_info *vn_info);
-void canon_path(struct proc *p, char *path, char *cpath);
+void	canon_path(struct thread *td, char *path, char *cpath);
 
 int	msgctl_to_event(int cmd);
 int	semctl_to_event(int cmd);

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#10 (text+ko) ====

@@ -141,10 +141,10 @@
 void			 audit_arg_signum(u_int signum);
 void			 audit_arg_socket(int sodomain, int sotype, 
 						int soprotocol);
-void			 audit_arg_sockaddr(struct proc *p, 
+void			 audit_arg_sockaddr(struct thread *td,
 						struct sockaddr *so);
 void			 audit_arg_auid(uid_t auid);
-void			 audit_arg_upath(struct proc *p, char *upath, 
+void			 audit_arg_upath(struct thread *td, char *upath, 
 					 u_int64_t flags);
 void			 audit_arg_vnpath(struct vnode *vp, u_int64_t flags);
 void			 audit_arg_text(char *text);

From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 21:23:15 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9AE8516A4D1; Mon, 12 Jan 2004 21:23:15 -0800 (PST)
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 75CB616A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:23:15 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E58B443D5A
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:22:40 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0D5Me0B004983
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:22:40 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D5Me3t004980
	for perforce@freebsd.org; Mon, 12 Jan 2004 21:22:40 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 21:22:40 -0800 (PST)
Message-Id: <200401130522.i0D5Me3t004980@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45251 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: Tue, 13 Jan 2004 05:23:16 -0000

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

Change 45251 by rwatson@rwatson_paprika on 2004/01/12 21:22:10

	Include audit-private header file.
	
	Use _KERNEL instead of KERNEL.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#6 (text+ko) ====

@@ -38,6 +38,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
+#include <security/audit/audit_private.h>
 #include <security/audit/kern_audit.h>
 
 #define GET_TOKEN_AREA(tok, dptr, length)				\
@@ -490,7 +491,7 @@
 	return t;
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * Kernel version of the add file token function, where the time value 
  * is passed in as an additional parameter.
@@ -1246,7 +1247,7 @@
 }
 
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * Kernel version of the BSM header token functions. These versions take 
  * a timespec struct as an additional parameter in order to obtain the

From owner-p4-projects@FreeBSD.ORG  Tue Jan 13 12:43:32 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 103E316A4D0; Tue, 13 Jan 2004 12:43:32 -0800 (PST)
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 DB8B416A4CE
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 12:43:31 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CF26743D48
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 12:43:30 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0DKhU0B034896
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 12:43:30 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0DKhUSK034893
	for perforce@freebsd.org; Tue, 13 Jan 2004 12:43:30 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Jan 2004 12:43:30 -0800 (PST)
Message-Id: <200401132043.i0DKhUSK034893@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45285 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: Tue, 13 Jan 2004 20:43:32 -0000

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

Change 45285 by rwatson@rwatson_tislabs on 2004/01/13 12:43:04

	Update copyright; add some more contributors.  If I forgot someone,
	let me know.

Affected files ...

.. //depot/projects/trustedbsd/mac/share/man/man9/mac.9#15 edit

Differences ...

==== //depot/projects/trustedbsd/mac/share/man/man9/mac.9#15 (text+ko) ====

@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
-.\" Copyright (c) 2002 Networks Associates Technology, Inc.
+.\" Copyright (c) 2002, 2003, 2004 Networks Associates Technology, Inc.
 .\" All rights reserved.
 .\"
 .\" This software was developed by Robert Watson for the TrustedBSD Project.
@@ -199,11 +199,13 @@
 include (in alphabetical order):
 .An Lee Badger ,
 .An Brian Feldman ,
+.An Hrishikesh Dandekar ,
 .An Tim Fraser ,
 .An Doug Kilpatrick ,
 .An Suresh Krishnaswamy ,
 .An Adam Migus ,
 .An Wayne Morrison ,
+.An Andrew Reisse ,
 .An Chris Vance ,
 and
 .An Robert Watson .
@@ -216,11 +218,15 @@
 .An Dag-Erling Smorgrav .
 .Pp
 Additional contributors include:
+.Sn Pawel Dawidek ,
 .An Chris Faulhaber ,
 .An Ilmar Habibulin ,
+.An Mike Halderman ,
+.An Bosko Milekic ,
 .An Thomas Moestl ,
+.An Andrew Reiter ,
 and
-.An Andrew Reiter .
+.An Tim Robbins .
 .Sh HISTORY
 The
 .Tn TrustedBSD

From owner-p4-projects@FreeBSD.ORG  Tue Jan 13 13:15:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 697C516A4D0; Tue, 13 Jan 2004 13:15:01 -0800 (PST)
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 369AF16A4CE
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 13:15:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7D6643D58
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 13:14:55 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0DLEt0B048261
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 13:14:55 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0DLEZAs048258
	for perforce@freebsd.org; Tue, 13 Jan 2004 13:14:35 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Jan 2004 13:14:35 -0800 (PST)
Message-Id: <200401132114.i0DLEZAs048258@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45286 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: Tue, 13 Jan 2004 21:15:01 -0000

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

Change 45286 by rwatson@rwatson_tislabs on 2004/01/13 13:14:03

	Integrate through just past 5.2 release:
	
	- Updated copyright.
	- Yet more makefile restructuring.
	- pnpinfo works better without privilege!
	- openpam update
	- tcpdump security fixes
	- openssh update.
	- the usual plethora of /etc updates
	- a few fortunes
	- additional compat libraries for 4.x
	- sundry amd64 fixes
	- more runes and multibytes
	- kse bugfixes, libthr, ibc_r bugfixes.
	- 5.2 release and sysinstall changes.
	- various ata fixes.
	- ndisulator.
	- lots of acpi fixes and an acpi update.
	- sched_ule fixes.
	- subtractive bus magic from imp.
	- lots of 32-bit abi emulation for 64-bit platforms.
	- atheros hal update.
	- many other driver updates (aic, bktr, drm, firewire, ...)
	- msdos iconv, dirty bit.
	- some vn_fullpath cleanups.
	- smbfs crypto stuff.
	- unionfs fixes.
	- syscalls.master becomes 100% conflict due to a syntax change on
	  every line.
	- mbuf tag changes -- now have a free method.
	- lookup back mac_copy_*() change for credentials.
	- posix semaphore performance optimization for a small number of
	  sems (likely to conflict with local sem changes).
	- get rid of faking up mbufs on the stack to hand then to bpf,
	  introduce new bpf api to submit "just the data".
	- 0 -> NULL; 0 -> MTX_DEF.
	- multicast routing unloadable again
	- minmss DoS protections (?)
	- mtree bug fixes.
	
	- scores of misc bug fixes, etc.
	- scores of documentation improvements.

Affected files ...

.. //depot/projects/trustedbsd/base/COPYRIGHT#2 integrate
.. //depot/projects/trustedbsd/base/Makefile#30 integrate
.. //depot/projects/trustedbsd/base/Makefile.inc1#48 integrate
.. //depot/projects/trustedbsd/base/UPDATING#42 integrate
.. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#9 integrate
.. //depot/projects/trustedbsd/base/bin/date/date.1#7 integrate
.. //depot/projects/trustedbsd/base/bin/ls/ls.1#20 integrate
.. //depot/projects/trustedbsd/base/bin/ls/ls.c#20 integrate
.. //depot/projects/trustedbsd/base/bin/rm/rm.c#10 integrate
.. //depot/projects/trustedbsd/base/bin/sh/eval.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#4 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/c-lex.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/freebsd.h#9 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/linux-ecoff.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/osf12.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/osf2or3.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-wince-pe.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/riscix.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/riscix1-1.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/rix-gas.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-riscix#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-c4x.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-i128.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-i32.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-i386.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-i64.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-m68k.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-sh.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-sparc.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/float-vax.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/386bsd.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/aix386.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/aix386ng.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/bsd386.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/dgux.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/djgpp-rtems.h#6 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#16 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd64.h#6 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/interix.c#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/isc.h#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/isccoff.h#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/iscdbx.h#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux-oldld.h#6 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/next.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/osf1-ci.asm#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/osf1-cn.asm#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/osf1elf.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/osf1elfgdb.h#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/osfelf.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/osfrose.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/rtems.h#6 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/seq-gas.h#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/seq-sysv3.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/seq2-sysv3.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sequent.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2gas.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sun.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sun386.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-dgux#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-next#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-osf#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-osf1elf#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-sco5gas#4 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/v3gas.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/nextstep-protos.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/nextstep.c#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/nextstep.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/nextstep21.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/softfloat.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/t-linux#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#9 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/rtems.h#6 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-g1.asm#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol27-sld.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/config/t-install-cpp#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/cp/mpw-config.in#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/cp/mpw-make.sed#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/dependence.c#4 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/doc/vms.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/enquire.c#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/f/version.c#12 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/f/version.h#3 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/function.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/ggc-callbacks.c#4 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/halfpic.c#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/halfpic.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/hash.c#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/hash.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/tradcif.y#5 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/tradcpp.c#8 delete
.. //depot/projects/trustedbsd/base/contrib/gcc/tradcpp.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/libf2c/ChangeLog.egcs#2 delete
.. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/rawio.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libobjc/objc-features.texi#2 delete
.. //depot/projects/trustedbsd/base/contrib/libreadline/readline.h#3 integrate
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/generic/bits/limits.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/aix/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/aix/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/aix/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/generic/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/generic/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/hpux/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/newlib/bits/os_defines.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.host#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/backward/strstream.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/generic_shadow.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/slice.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/assert.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_climits.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/ctype.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/errno.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/fcntl.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/features.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/float.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/iconv.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/iolibio.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/langinfo.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/libio.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/libioP.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/limits.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/locale.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/math.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/pthread.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/setjmp.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/signal.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/stdarg.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/stddef.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/stdio.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/stdlib.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/string.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/sys/cdefs.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/time.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/unistd.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/wchar.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_shadow/wctype.h#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/mkcshadow#4 delete
.. //depot/projects/trustedbsd/base/contrib/libstdc++/mkinclosure#4 delete
.. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#17 integrate
.. //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/tcp_wrappers/socket.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isakmp.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-l2tp.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/print-radius.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/CREDITS#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/LICENCE#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/README.dns#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/README.smartcard#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/TODO#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/atomicio.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/atomicio.h#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb4.c#6 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-options.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-rh-rsa.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-rhosts.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.h#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-chall.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-gss.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam-freebsd.c#10 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam.c#7 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#9 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/authfd.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/authfd.h#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/buffer.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#10 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/cipher-3des1.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/cipher-aes.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/cipher-bf1.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/cipher-ctr.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/compat.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/config.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/deattack.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/dh.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/dispatch.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/dns.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/dns.h#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/entropy.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/groupaccess.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/gss-genr.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv-krb5.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/key.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/key.h#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/log.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/log.h#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/logintest.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/md5crypt.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/md5crypt.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/mdoc2man.awk#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/mdoc2man.pl#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/misc.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/moduli.h#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/monitor.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/monitor_fdpass.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/msg.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/myproposal.h#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/nchan.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/Makefile.in#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/base64.h#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/basename.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/basename.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bindresvport.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-getpeereid.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.h#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-nextstep.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-snprintf.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-waitpid.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/daemon.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/dirname.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/dirname.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-gai-errnos.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#3 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#3 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-getnameinfo.c#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-getnameinfo.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.h#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-socket.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getcwd.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getcwd.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getgrouplist.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getopt.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getopt.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.h#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/glob.h#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_aton.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntoa.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntoa.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntop.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.h#3 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-irix.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-irix.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/realpath.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/realpath.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/rresvport.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/rresvport.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setenv.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setenv.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setproctitle.h#3 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcat.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcat.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcpy.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strlcpy.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strmode.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strmode.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strsep.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/strsep.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.h#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xcrypt.c#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xmmap.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xmmap.h#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#8 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/packet.h#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/radix.c#5 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/radix.h#3 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#8 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/README.regress#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-getpeereid.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-ptrace.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-timeout.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/authorized_keys_root#2 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/dynamic-forward.sh#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/forwarding.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/proto-version.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/reconfigure.sh#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/rekey.sh#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-badcmds.sh#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-batch.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-cmds.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com-client.sh#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com-keygen.sh#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com-sftp.sh#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com.sh#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/stderr-after-eof.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/stderr-data.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/test-exec.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/transfer.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/try-ciphers.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/regress/yes-head.sh#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/scard-opensc.c#2 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/scard.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/scard.h#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#10 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/session.c#17 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/session.h#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sftp-int.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.8#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.1#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.1#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#9 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-dss.h#4 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-gss.h#1 branch
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.8#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rsa.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rsa.h#4 delete
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#8 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh.h#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh2.h#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#12 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#8 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect1.c#6 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#8 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#9 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#10 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#13 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#10 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshlogin.c#8 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.c#7 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.c#3 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ttymodes.c#4 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/uidswap.c#5 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/version.h#12 integrate
.. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.cnf#3 integrate
.. //depot/projects/trustedbsd/base/etc/Makefile#37 integrate
.. //depot/projects/trustedbsd/base/etc/apmd.conf#3 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#10 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#34 integrate
.. //depot/projects/trustedbsd/base/etc/devd.conf#9 integrate
.. //depot/projects/trustedbsd/base/etc/moduli#2 delete
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#22 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#22 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#33 integrate
.. //depot/projects/trustedbsd/base/etc/periodic/daily/150.clean-hoststat#4 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#16 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/cleartmp#5 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/cron#4 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/diskless#10 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/jail#5 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/mountcritlocal#6 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/power_profile#1 branch
.. //depot/projects/trustedbsd/base/etc/rc.d/root#6 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/syscons#6 integrate
.. //depot/projects/trustedbsd/base/etc/rc.resume#3 integrate
.. //depot/projects/trustedbsd/base/etc/rc.subr#14 integrate
.. //depot/projects/trustedbsd/base/etc/rc.suspend#3 integrate
.. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#8 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#31 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#19 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#9 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#14 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/murphy#4 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/startrek#6 integrate
.. //depot/projects/trustedbsd/base/games/fortune/fortune/fortune.c#5 integrate
.. //depot/projects/trustedbsd/base/games/fortune/strfile/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.c#6 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#15 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/auto-host.h#9 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/f77/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/f771/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/include/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#18 integrate
.. //depot/projects/trustedbsd/base/include/Makefile#34 integrate
.. //depot/projects/trustedbsd/base/include/dirent.h#5 integrate
.. //depot/projects/trustedbsd/base/include/fnmatch.h#4 integrate
.. //depot/projects/trustedbsd/base/include/locale.h#4 integrate
.. //depot/projects/trustedbsd/base/include/nss.h#2 integrate
.. //depot/projects/trustedbsd/base/include/paths.h#10 integrate
.. //depot/projects/trustedbsd/base/include/regex.h#5 integrate
.. //depot/projects/trustedbsd/base/include/resolv.h#4 integrate
.. //depot/projects/trustedbsd/base/include/rpc/types.h#2 integrate
.. //depot/projects/trustedbsd/base/include/stddef.h#4 integrate
.. //depot/projects/trustedbsd/base/include/stdio.h#11 integrate
.. //depot/projects/trustedbsd/base/include/stdlib.h#19 integrate
.. //depot/projects/trustedbsd/base/include/string.h#9 integrate
.. //depot/projects/trustedbsd/base/include/strings.h#4 integrate
.. //depot/projects/trustedbsd/base/include/time.h#7 integrate
.. //depot/projects/trustedbsd/base/include/unistd.h#19 integrate
.. //depot/projects/trustedbsd/base/include/wchar.h#14 integrate
.. //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#11 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpgetmask.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/fpsetmask.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/makecontext.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/makecontext.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/opendir.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/ttyname.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gmon/mcount.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ioperm.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_ioperm.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_ldt.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_vm86.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/makecontext.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/signalcontext.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#18 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/gbk.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/localeconv.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mblen.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbstowcs.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbtowc.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/multibyte.3#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.3#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/srune.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/wcstold.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/wcstombs.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wctomb.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/net/nss_compat.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/res_init.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/res_send.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete_entry.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/powerpc/_fpmath.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_time.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_qp.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/signalcontext.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_install.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_setup.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/getc.3#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#14 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwscanf.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/atexit.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/atexit.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/exit.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/Makefile.inc#7 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/ffs.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/ffs.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/ffsl.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/string/fls.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/string/flsl.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/string/index.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/rindex.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#13 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/accept.2#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/getpeername.2#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/getsockname.2#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/getsockopt.2#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/ktrace.2#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/ptrace.2#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/sendfile.2#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/pthread_private.h#15 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_create.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_init.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_join.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_rwlock.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_sig.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_write.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libio/alpha_sethae.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libkiconv/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/libkiconv/kiconv.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libkiconv/xlat16_iconv.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#21 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_echo/pam_echo.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_group/pam_group.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_krb5/pam_krb5.c#12 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ksu/pam_ksu.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_lastlog/pam_lastlog.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/pam_login_access.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_radius/pam_radius.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_rhosts/pam_rhosts.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_securetty/pam_securetty.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.c#14 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/enter_uts.S#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/pthread_md.h#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_attr.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_equal.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_exit.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_getspecific.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_join.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_key_create.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_key_delete.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_kill.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_lock.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutexattr.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_once.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlock_wrlock.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_schedparam.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_self.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_setspecific.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_sigmask.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_testcancel.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_destroy.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_getvalue.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_init.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_post.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_wait.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/man/sigwait.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_accept.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_aio_suspend.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_close.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_connect.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_creat.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fcntl.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fsync.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_join.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#20 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_msync.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_open.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pause.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_poll.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#18 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pselect.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_read.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_readv.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlock.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_select.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sem.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#14 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sleep.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_system.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_tcdrain.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait4.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_waitpid.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_write.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_writev.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/sdp-int.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/sdp.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/search.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/session.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/util.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libstand/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/lib/libstand/gzipfs.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_setcurthread.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_cond.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_kern.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#5 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_resume_np.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_spinlock.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_subr.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_syscalls.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libusbhid/usbhid.3#6 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#22 integrate
.. //depot/projects/trustedbsd/base/libexec/rshd/rshd.8#5 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/amd64/lockdflt.c#2 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/amd64/reloc.c#3 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/amd64/rtld_machdep.h#3 integrate
.. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#20 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#54 integrate
.. //depot/projects/trustedbsd/base/release/Makefile.inc.docports#10 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#9 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/errata/article.sgml#14 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#50 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#9 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#9 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#78 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/early-adopter/article.sgml#6 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/errata/article.sgml#13 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#3 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#15 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#7 integrate
.. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#27 integrate
.. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#10 integrate
.. //depot/projects/trustedbsd/base/release/i386/drivers.conf#20 integrate
.. //depot/projects/trustedbsd/base/release/scripts/mkpkgindex.sh#1 branch
.. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#22 integrate
.. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/sbin/Makefile#21 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_eni.c#4 delete
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_show.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#9 integrate
.. //depot/projects/trustedbsd/base/sbin/bsdlabel/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.8#8 integrate
.. //depot/projects/trustedbsd/base/sbin/comcontrol/comcontrol.8#3 integrate
.. //depot/projects/trustedbsd/base/sbin/cxconfig/Makefile#3 delete
.. //depot/projects/trustedbsd/base/sbin/cxconfig/cxconfig.8#2 delete
.. //depot/projects/trustedbsd/base/sbin/cxconfig/cxconfig.c#3 delete
.. //depot/projects/trustedbsd/base/sbin/dhclient/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/base/sbin/dump/main.c#19 integrate
.. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.c#15 integrate
.. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#18 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck/fsutil.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck/fsutil.h#4 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/boot.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/check.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/dir.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/dosfs.h#3 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/ext.h#6 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/fat.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/fsck_msdosfs.8#7 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/main.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/growfs/growfs.8#11 integrate
.. //depot/projects/trustedbsd/base/sbin/init/init.c#6 integrate
.. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.8#9 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#27 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#22 integrate
.. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.8#10 integrate
.. //depot/projects/trustedbsd/base/sbin/mknod/mknod.8#7 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/getmntopts.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.c#12 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/mount_msdosfs.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_ntfs/mount_ntfs.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_nullfs/mount_nullfs.8#7 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_udf/mount_udf.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/route/route.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/sconfig/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sbin/sconfig/sconfig.8#1 branch
.. //depot/projects/trustedbsd/base/sbin/sconfig/sconfig.c#1 branch
.. //depot/projects/trustedbsd/base/sbin/umount/umount.c#11 integrate
.. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#12 integrate
.. //depot/projects/trustedbsd/base/secure/libexec/sftp-server/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/secure/libexec/ssh-keysign/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/scp/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/sftp/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-add/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-agent/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-keygen/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-keyscan/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#12 integrate
.. //depot/projects/trustedbsd/base/share/colldef/Makefile#19 integrate
.. //depot/projects/trustedbsd/base/share/colldef/be_BY.CP1131.src#1 branch
.. //depot/projects/trustedbsd/base/share/colldef/be_BY.CP1251.src#1 branch
.. //depot/projects/trustedbsd/base/share/colldef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/trustedbsd/base/share/colldef/map.CP1131#1 branch
.. //depot/projects/trustedbsd/base/share/examples/meteor/rgb16.c#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/meteor/rgb24.c#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/meteor/test-n.c#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/meteor/yuvpk.c#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/meteor/yuvpl.c#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/scsi_target/scsi_cmds.c#5 integrate
.. //depot/projects/trustedbsd/base/share/examples/scsi_target/scsi_target.h#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man3/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man3/pthread.3#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_timedlock.3#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/Makefile#43 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#14 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/acpi_thermal.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/aha.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/amr.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ata.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ath.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ath_hal.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/aue.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/crypto.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/dc.4#9 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/dcons.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/dcons_crom.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/digi.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/ef.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/firewire.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/fpa.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/fwe.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/fwohci.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/gdb.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/gx.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/harp.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/kue.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/lge.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/lmc.4#3 delete
.. //depot/projects/trustedbsd/base/share/man/man4/mac_stub.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/CPU_ELAN.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cx.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/dgb.4#3 delete
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/meteor.4#2 delete
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ndis.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/matcd.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/meteor.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/miibus.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_atm.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_atmpif.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_iface.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_pppoe.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_sscfu.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_sscop.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ng_uni.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/nge.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/pccbb.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/polling.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/re.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/rndtest.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/rue.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/safe.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sbp.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sbp_targ.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sk.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ste.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/stg.4#3 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Jan 13 14:00:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3AC1716A4D5; Tue, 13 Jan 2004 14:00:33 -0800 (PST)
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 E6CC916A4CE
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 14:00:32 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1E2C943D46
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 13:59:36 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0DLxZ0B057540
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 13:59:35 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0DLxDhQ057536
	for perforce@freebsd.org; Tue, 13 Jan 2004 13:59:13 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Jan 2004 13:59:13 -0800 (PST)
Message-Id: <200401132159.i0DLxDhQ057536@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45292 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: Tue, 13 Jan 2004 22:00:34 -0000

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

Change 45292 by rwatson@rwatson_tislabs on 2004/01/13 13:58:43

	Integrate MAC branch through just past 5.2 release:
	
	- Updated copyright.
	- Yet more makefile restructuring.
	- pnpinfo works better without privilege!
	- openpam update
	- tcpdump security fixes
	- openssh update.
	- the usual plethora of /etc updates
	- a few fortunes
	- additional compat libraries for 4.x
	- sundry amd64 fixes
	- more runes and multibytes
	- kse bugfixes, libthr, ibc_r bugfixes.
	- 5.2 release and sysinstall changes.
	- various ata fixes.
	- ndisulator.
	- lots of acpi fixes and an acpi update.
	- sched_ule fixes.
	- subtractive bus magic from imp.
	- lots of 32-bit abi emulation for 64-bit platforms.
	- atheros hal update.
	- many other driver updates (aic, bktr, drm, firewire, ...)
	- msdos iconv, dirty bit.
	- some vn_fullpath cleanups.
	- smbfs crypto stuff.
	- unionfs fixes.
	- syscalls.master becomes 100% conflict due to a syntax change on
	  every line.
	- mbuf tag changes -- now have a free method.
	- lookup back mac_copy_*() change for credentials.
	- posix semaphore performance optimization for a small number of
	  sems (likely to conflict with local sem changes).
	- get rid of faking up mbufs on the stack to hand then to bpf,
	  introduce new bpf api to submit "just the data".
	- 0 -> NULL; 0 -> MTX_DEF.
	- multicast routing unloadable again
	- minmss DoS protections (?)
	- mtree bug fixes.
	
	- scores of misc bug fixes, etc.
	- scores of documentation improvements.

Affected files ...

.. //depot/projects/trustedbsd/mac/COPYRIGHT#3 integrate
.. //depot/projects/trustedbsd/mac/Makefile#27 integrate
.. //depot/projects/trustedbsd/mac/Makefile.inc1#45 integrate
.. //depot/projects/trustedbsd/mac/UPDATING#36 integrate
.. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#10 integrate
.. //depot/projects/trustedbsd/mac/bin/date/date.1#8 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.1#21 integrate
.. //depot/projects/trustedbsd/mac/bin/ls/ls.c#27 integrate
.. //depot/projects/trustedbsd/mac/bin/rm/rm.c#11 integrate
.. //depot/projects/trustedbsd/mac/bin/sh/eval.c#8 integrate
.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#5 integrate
.. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/freebsd.h#9 integrate
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/linux-ecoff.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/osf12.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/osf2or3.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm-wince-pe.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/riscix.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/riscix1-1.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/rix-gas.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/t-riscix#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-c4x.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-i128.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-i32.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-i386.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-i64.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-m68k.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-sh.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-sparc.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-vax.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/386bsd.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/aix386.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/aix386ng.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/bsd386.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/dgux.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/djgpp-rtems.h#7 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#16 integrate
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd64.h#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/interix.c#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/isc.h#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/isccoff.h#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/iscdbx.h#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux-oldld.h#7 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/next.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/osf1-ci.asm#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/osf1-cn.asm#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/osf1elf.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/osf1elfgdb.h#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/osfelf.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/osfrose.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/rtems.h#7 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/seq-gas.h#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/seq-sysv3.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/seq2-sysv3.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sequent.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sol2gas.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sun.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sun386.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-dgux#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-next#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-osf#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-osf1elf#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-sco5gas#5 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/v3gas.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/nextstep-protos.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/nextstep.c#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/nextstep.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/nextstep21.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/softfloat.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/t-linux#2 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/freebsd.h#9 integrate
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/rtems.h#7 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-g1.asm#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol27-sld.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-install-cpp#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/mpw-config.in#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/mpw-make.sed#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/dependence.c#5 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/vms.texi#3 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/enquire.c#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/f/version.c#11 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/f/version.h#4 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/function.c#10 integrate
.. //depot/projects/trustedbsd/mac/contrib/gcc/ggc-callbacks.c#5 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/halfpic.c#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/halfpic.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/hash.c#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/hash.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/tradcif.y#6 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/tradcpp.c#8 delete
.. //depot/projects/trustedbsd/mac/contrib/gcc/tradcpp.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipmon.c#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.c#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.c#7 integrate
.. //depot/projects/trustedbsd/mac/contrib/libf2c/ChangeLog.egcs#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/rawio.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libobjc/objc-features.texi#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.h#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/generic/bits/limits.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/aix/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/aix/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/aix/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/generic/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/generic/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/hpux/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/newlib/bits/os_defines.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#3 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#6 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.host#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/backward/strstream.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/generic_shadow.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/slice.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/assert.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_climits.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/ctype.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/errno.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/fcntl.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/features.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/float.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/iconv.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/iolibio.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/langinfo.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/libio.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/libioP.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/limits.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/locale.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/math.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/pthread.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/setjmp.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/signal.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/stdarg.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/stddef.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/stdio.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/stdlib.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/string.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/sys/cdefs.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/time.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/unistd.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/wchar.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_shadow/wctype.h#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/mkcshadow#5 delete
.. //depot/projects/trustedbsd/mac/contrib/libstdc++/mkinclosure#5 delete
.. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#18 integrate
.. //depot/projects/trustedbsd/mac/contrib/pnpinfo/pnpinfo.c#3 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcp_wrappers/socket.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isakmp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-l2tp.c#4 integrate
.. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-radius.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/CREDITS#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/LICENCE#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/README.dns#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/README.smartcard#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/TODO#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/atomicio.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/atomicio.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb4.c#6 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-options.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rh-rsa.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rhosts.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-sia.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#10 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam.c#7 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#9 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.h#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/buffer.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#10 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-3des1.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-aes.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-bf1.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-ctr.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/compat.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/deattack.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/dispatch.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/dns.h#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/entropy.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/groupaccess.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/gss-genr.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/key.h#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/log.h#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/logintest.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/md5crypt.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/md5crypt.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.awk#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.pl#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.h#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_fdpass.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/msg.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/myproposal.h#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/nchan.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/base64.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/basename.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/basename.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bindresvport.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cray.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-getpeereid.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-nextstep.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-snprintf.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-waitpid.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/daemon.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/dirname.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/dirname.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-gai-errnos.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#3 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#3 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-getnameinfo.c#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-getnameinfo.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-socket.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getcwd.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getcwd.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getgrouplist.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getopt.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getopt.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.h#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/glob.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/glob.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_aton.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntoa.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntoa.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntop.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/mktemp.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/mktemp.h#3 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-irix.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-irix.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/realpath.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/realpath.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/rresvport.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/rresvport.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/setenv.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/setenv.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/setproctitle.h#3 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcat.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcat.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcpy.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strlcpy.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strmode.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strmode.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strsep.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/strsep.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/vis.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/vis.h#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xcrypt.c#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xmmap.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xmmap.h#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#8 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.h#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/radix.c#5 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/radix.h#3 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#8 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/README.regress#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/agent-getpeereid.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/agent-ptrace.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/agent-timeout.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/agent.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/authorized_keys_root#2 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/dynamic-forward.sh#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/forwarding.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/proto-version.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reconfigure.sh#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/rekey.sh#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp-badcmds.sh#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp-batch.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp-cmds.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/ssh-com-client.sh#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/ssh-com-keygen.sh#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/ssh-com-sftp.sh#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/ssh-com.sh#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/stderr-after-eof.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/stderr-data.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/transfer.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/try-ciphers.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/yes-head.sh#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/scard-opensc.c#2 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/scard.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/scard.h#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#10 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#18 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/session.h#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-common.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-int.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.8#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.1#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.1#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#9 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-dss.h#4 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-gss.h#1 branch
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.8#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rsa.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rsa.h#4 delete
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#8 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.h#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh2.h#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#12 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#8 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#6 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#8 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#9 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#10 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#13 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#10 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshlogin.c#8 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.c#7 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.c#3 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/ttymodes.c#4 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/uidswap.c#5 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#12 integrate
.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.cnf#3 integrate
.. //depot/projects/trustedbsd/mac/etc/Makefile#36 integrate
.. //depot/projects/trustedbsd/mac/etc/apmd.conf#3 integrate
.. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#10 integrate
.. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#32 integrate
.. //depot/projects/trustedbsd/mac/etc/devd.conf#8 integrate
.. //depot/projects/trustedbsd/mac/etc/moduli#2 delete
.. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#30 integrate
.. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#19 integrate
.. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#31 integrate
.. //depot/projects/trustedbsd/mac/etc/periodic/daily/150.clean-hoststat#4 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#16 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/cleartmp#5 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/cron#4 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/diskless#10 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/jail#5 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritlocal#6 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/power_profile#1 branch
.. //depot/projects/trustedbsd/mac/etc/rc.d/root#6 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.d/syscons#6 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.resume#3 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.subr#14 integrate
.. //depot/projects/trustedbsd/mac/etc/rc.suspend#3 integrate
.. //depot/projects/trustedbsd/mac/etc/sendmail/freebsd.mc#8 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#29 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#19 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#9 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#14 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/murphy#4 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/startrek#6 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/fortune/fortune.c#5 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/strfile/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/strfile/strfile.c#6 integrate
.. //depot/projects/trustedbsd/mac/gnu/lib/libstdc++/Makefile#13 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_int/Makefile#9 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/auto-host.h#9 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/f77/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/f771/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/include/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#17 integrate
.. //depot/projects/trustedbsd/mac/include/Makefile#39 integrate
.. //depot/projects/trustedbsd/mac/include/dirent.h#5 integrate
.. //depot/projects/trustedbsd/mac/include/fnmatch.h#4 integrate
.. //depot/projects/trustedbsd/mac/include/locale.h#4 integrate
.. //depot/projects/trustedbsd/mac/include/nss.h#2 integrate
.. //depot/projects/trustedbsd/mac/include/paths.h#10 integrate
.. //depot/projects/trustedbsd/mac/include/regex.h#5 integrate
.. //depot/projects/trustedbsd/mac/include/resolv.h#4 integrate
.. //depot/projects/trustedbsd/mac/include/rpc/types.h#2 integrate
.. //depot/projects/trustedbsd/mac/include/stddef.h#4 integrate
.. //depot/projects/trustedbsd/mac/include/stdio.h#11 integrate
.. //depot/projects/trustedbsd/mac/include/stdlib.h#18 integrate
.. //depot/projects/trustedbsd/mac/include/string.h#8 integrate
.. //depot/projects/trustedbsd/mac/include/strings.h#4 integrate
.. //depot/projects/trustedbsd/mac/include/time.h#7 integrate
.. //depot/projects/trustedbsd/mac/include/unistd.h#16 integrate
.. //depot/projects/trustedbsd/mac/include/wchar.h#13 integrate
.. //depot/projects/trustedbsd/mac/kerberos5/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/Makefile#8 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#1 branch
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#1 branch
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/Makefile#10 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/Makefile#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/fpgetmask.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/fpsetmask.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/makecontext.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/makecontext.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/opendir.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.3#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gen/ttyname.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/gmon/mcount.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ioperm.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ldt.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_ioperm.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_ldt.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_vm86.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/makecontext.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/signalcontext.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#17 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/gbk.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/localeconv.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mblen.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mbstowcs.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/locale/mbtowc.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/locale/multibyte.3#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.3#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.c#9 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/setrunelocale.c#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/srune.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstold.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstombs.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/locale/wctomb.3#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/net/nss_compat.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/net/res_init.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/net/res_send.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl_delete_entry.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#18 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/powerpc/_fpmath.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/rpc/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_time.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_qp.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/signalcontext.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap_install.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap_setup.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/getc.3#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#14 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwprintf.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfwscanf.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/atexit.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/atexit.h#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/exit.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/string/Makefile.inc#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/string/ffs.3#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/string/ffs.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/string/ffsl.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/string/fls.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/string/flsl.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libc/string/index.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/string/rindex.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#13 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/accept.2#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/getpeername.2#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/getsockname.2#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/getsockopt.2#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/kse.2#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/ktrace.2#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/ptrace.2#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/sendfile.2#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/sys/stat.2#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#15 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_create.c#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_init.c#9 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_join.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_rwlock.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sig.c#9 integrate
.. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_write.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libio/alpha_sethae.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libkiconv/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libkiconv/kiconv.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libkiconv/xlat16_iconv.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#20 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_echo/pam_echo.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_group/pam_group.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_krb5/pam_krb5.c#12 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_ksu/pam_ksu.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_lastlog/pam_lastlog.c#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_login_access/pam_login_access.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_radius/pam_radius.c#12 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_rhosts/pam_rhosts.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_securetty/pam_securetty.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/pam_unix.c#14 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/arch/amd64/amd64/enter_uts.S#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/arch/ia64/include/pthread_md.h#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_attr.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_equal.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_exit.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_getspecific.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_join.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_key_create.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_key_delete.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_kill.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_mutex_lock.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_mutexattr.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_once.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_rwlock_wrlock.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_schedparam.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_self.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_setspecific.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_sigmask.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_testcancel.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/sem_destroy.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/sem_getvalue.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/sem_init.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/sem_post.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/sem_wait.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/man/sigwait.3#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/pthread.map#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_accept.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_aio_suspend.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cancel.c#10 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_close.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cond.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_connect.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_creat.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#9 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fcntl.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fsync.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_join.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#16 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_msync.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#9 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_nanosleep.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_open.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pause.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_poll.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#15 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pselect.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_read.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_readv.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_rwlock.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_select.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sem.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigsuspend.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigwait.c#8 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sleep.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spinlock.c#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_system.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_tcdrain.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_wait.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_wait4.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_waitpid.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_write.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_writev.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libsdp/sdp-int.h#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libsdp/sdp.3#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libsdp/search.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libsdp/session.c#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libsdp/util.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#11 integrate
.. //depot/projects/trustedbsd/mac/lib/libstand/gzipfs.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_setcurthread.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_cond.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_create.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_kern.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#6 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#5 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_resume_np.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_setschedparam.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sig.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_spinlock.c#4 integrate
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_subr.c#1 branch
.. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_syscalls.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libusbhid/usbhid.3#6 integrate
.. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#22 integrate
.. //depot/projects/trustedbsd/mac/libexec/rshd/rshd.8#5 integrate
.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/amd64/lockdflt.c#2 integrate
.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/amd64/reloc.c#3 integrate
.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/amd64/rtld_machdep.h#3 integrate
.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#18 integrate
.. //depot/projects/trustedbsd/mac/release/Makefile#53 integrate
.. //depot/projects/trustedbsd/mac/release/Makefile.inc.docports#10 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#8 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/errata/article.sgml#13 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#45 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#9 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#8 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#67 integrate
.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/early-adopter/article.sgml#6 integrate
.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/errata/article.sgml#13 integrate
.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#3 integrate
.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#15 integrate
.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#7 integrate
.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#24 integrate
.. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#10 integrate
.. //depot/projects/trustedbsd/mac/release/i386/drivers.conf#20 integrate
.. //depot/projects/trustedbsd/mac/release/scripts/mkpkgindex.sh#1 branch
.. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#21 integrate
.. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/Makefile#23 integrate
.. //depot/projects/trustedbsd/mac/sbin/atm/atm/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/atm/atm/atm_eni.c#4 delete
.. //depot/projects/trustedbsd/mac/sbin/atm/atm/atm_show.c#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/atm/ilmid/ilmid.c#9 integrate
.. //depot/projects/trustedbsd/mac/sbin/bsdlabel/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/comcontrol/comcontrol.8#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/cxconfig/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/sbin/cxconfig/cxconfig.8#2 delete
.. //depot/projects/trustedbsd/mac/sbin/cxconfig/cxconfig.c#3 delete
.. //depot/projects/trustedbsd/mac/sbin/dhclient/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/dump/main.c#19 integrate
.. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.c#15 integrate
.. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#16 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck/fsutil.c#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck/fsutil.h#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/boot.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/check.c#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/dir.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/dosfs.h#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/ext.h#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/fat.c#4 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/fsck_msdosfs.8#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/main.c#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/growfs/growfs.8#11 integrate
.. //depot/projects/trustedbsd/mac/sbin/init/init.c#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/ip6fw/ip6fw.8#9 integrate
.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#24 integrate
.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#19 integrate
.. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.8#10 integrate
.. //depot/projects/trustedbsd/mac/sbin/mknod/mknod.8#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount/getmntopts.c#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#14 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_cd9660/mount_cd9660.c#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_msdosfs/mount_msdosfs.c#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_ntfs/mount_ntfs.c#5 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_nullfs/mount_nullfs.8#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_udf/mount_udf.c#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/route/route.c#8 integrate
.. //depot/projects/trustedbsd/mac/sbin/sconfig/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sbin/sconfig/sconfig.8#1 branch
.. //depot/projects/trustedbsd/mac/sbin/sconfig/sconfig.c#1 branch
.. //depot/projects/trustedbsd/mac/sbin/umount/umount.c#10 integrate
.. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#11 integrate
.. //depot/projects/trustedbsd/mac/secure/libexec/sftp-server/Makefile#7 integrate
.. //depot/projects/trustedbsd/mac/secure/libexec/ssh-keysign/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.bin/scp/Makefile#7 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.bin/sftp/Makefile#7 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-add/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-agent/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-keygen/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh-keyscan/Makefile#5 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh/Makefile#9 integrate
.. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#11 integrate
.. //depot/projects/trustedbsd/mac/share/colldef/Makefile#17 integrate
.. //depot/projects/trustedbsd/mac/share/colldef/be_BY.CP1131.src#1 branch
.. //depot/projects/trustedbsd/mac/share/colldef/be_BY.CP1251.src#1 branch
.. //depot/projects/trustedbsd/mac/share/colldef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/trustedbsd/mac/share/colldef/map.CP1131#1 branch
.. //depot/projects/trustedbsd/mac/share/examples/meteor/rgb16.c#2 integrate
.. //depot/projects/trustedbsd/mac/share/examples/meteor/rgb24.c#2 integrate
.. //depot/projects/trustedbsd/mac/share/examples/meteor/test-n.c#2 integrate
.. //depot/projects/trustedbsd/mac/share/examples/meteor/yuvpk.c#2 integrate
.. //depot/projects/trustedbsd/mac/share/examples/meteor/yuvpl.c#2 integrate
.. //depot/projects/trustedbsd/mac/share/examples/scsi_target/scsi_cmds.c#5 integrate
.. //depot/projects/trustedbsd/mac/share/examples/scsi_target/scsi_target.h#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man3/Makefile#6 integrate
.. //depot/projects/trustedbsd/mac/share/man/man3/pthread.3#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man3/pthread_mutex_timedlock.3#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#39 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#13 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/acpi_thermal.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/aha.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/amr.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#8 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ath.4#6 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ath_hal.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/aue.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/crypto.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/dc.4#9 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/dcons.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/dcons_crom.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/digi.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/ef.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/firewire.4#7 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/fpa.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/fwe.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/fwohci.4#6 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/gdb.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/gx.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/harp.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/kue.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/lge.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/lmc.4#3 delete
.. //depot/projects/trustedbsd/mac/share/man/man4/mac_stub.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/CPU_ELAN.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/Makefile#10 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/cx.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/dgb.4#3 delete
.. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/meteor.4#2 delete
.. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/ndis.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/matcd.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/meteor.4#1 branch
.. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_atm.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_atmpif.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_iface.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_pppoe.4#6 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_sscfu.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_sscop.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ng_uni.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/nge.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/pccbb.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/polling.4#7 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/re.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/rndtest.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/rue.4#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/safe.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/sbp.4#6 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/sbp_targ.4#2 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/sk.4#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/ste.4#3 integrate
.. //depot/projects/trustedbsd/mac/share/man/man4/stg.4#3 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Jan 13 14:01:22 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 962FF16A4D1; Tue, 13 Jan 2004 14:01:22 -0800 (PST)
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 500A016A4CF
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 14:01:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AAC5043D55
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 14:00:39 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0DM0d0B057630
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 14:00:39 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0DM0bam057626
	for perforce@freebsd.org; Tue, 13 Jan 2004 14:00:37 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Tue, 13 Jan 2004 14:00:37 -0800 (PST)
Message-Id: <200401132200.i0DM0bam057626@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45293 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: Tue, 13 Jan 2004 22:01:23 -0000

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

Change 45293 by jhb@jhb_slimer on 2004/01/13 13:59:53

	IFC @45291.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#26 integrate
.. //depot/projects/smpng/sys/alpha/include/sysarch.h#3 integrate
.. //depot/projects/smpng/sys/amd64/include/profile.h#3 integrate
.. //depot/projects/smpng/sys/amd64/include/sysarch.h#4 integrate
.. //depot/projects/smpng/sys/boot/forth/beastie.4th#6 integrate
.. //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#3 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#36 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#5 integrate
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#5 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#5 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#5 integrate
.. //depot/projects/smpng/sys/conf/files#99 integrate
.. //depot/projects/smpng/sys/conf/files.alpha#26 integrate
.. //depot/projects/smpng/sys/conf/files.i386#51 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#37 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#15 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#34 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#31 integrate
.. //depot/projects/smpng/sys/conf/majors#33 integrate
.. //depot/projects/smpng/sys/conf/newvers.sh#10 integrate
.. //depot/projects/smpng/sys/conf/options.i386#39 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#17 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#4 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#56 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#21 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#34 integrate
.. //depot/projects/smpng/sys/dev/an/if_an.c#36 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#44 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#21 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-card.c#16 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#7 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#27 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#35 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-dma.c#34 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-isa.c#14 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#7 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#38 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#5 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-raid.c#26 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#17 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#45 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#20 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#23 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#39 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#22 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#29 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci.c#28 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#20 integrate
.. //depot/projects/smpng/sys/dev/firewire/sbp.c#31 integrate
.. //depot/projects/smpng/sys/dev/ida/ida.c#13 integrate
.. //depot/projects/smpng/sys/dev/ida/ida_disk.c#11 integrate
.. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#7 integrate
.. //depot/projects/smpng/sys/dev/ida/ida_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/ida/idareg.h#3 integrate
.. //depot/projects/smpng/sys/dev/ida/idavar.h#3 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#5 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#44 integrate
.. //depot/projects/smpng/sys/dev/pci/pci_pci.c#18 integrate
.. //depot/projects/smpng/sys/dev/pci/pci_user.c#11 integrate
.. //depot/projects/smpng/sys/dev/pci/pcib_private.h#6 integrate
.. //depot/projects/smpng/sys/dev/pdq/pdqvar.h#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#15 integrate
.. //depot/projects/smpng/sys/dev/trm/trm.c#13 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#44 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#44 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#44 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#14 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs.c#10 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#10 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#23 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#34 integrate
.. //depot/projects/smpng/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate
.. //depot/projects/smpng/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/smpng/sys/gnu/dev/sound/pci/emu10k1.h#3 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#1 branch
.. //depot/projects/smpng/sys/i386/conf/NOTES#73 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#55 integrate
.. //depot/projects/smpng/sys/i386/include/sysarch.h#6 integrate
.. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#11 integrate
.. //depot/projects/smpng/sys/ia64/include/cpufunc.h#19 integrate
.. //depot/projects/smpng/sys/ia64/include/sysarch.h#4 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#54 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#69 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#81 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#49 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#39 integrate
.. //depot/projects/smpng/sys/kern/tty.c#38 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#43 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#30 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#66 integrate
.. //depot/projects/smpng/sys/libkern/ffs.c#4 integrate
.. //depot/projects/smpng/sys/libkern/ffsl.c#1 branch
.. //depot/projects/smpng/sys/libkern/fls.c#1 branch
.. //depot/projects/smpng/sys/libkern/flsl.c#1 branch
.. //depot/projects/smpng/sys/modules/Makefile#68 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile#19 integrate
.. //depot/projects/smpng/sys/modules/acpi/Makefile.inc#1 branch
.. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_toshiba/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/cx/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/drm/mga/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/drm/r128/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/drm/radeon/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/drm/sis/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/drm/tdfx/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ida/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/bluetooth/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/bt3c/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/h4/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/hci/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/l2cap/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/socket/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/netgraph/fec/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/sound/driver/emu10k1/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/ubsa/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ucom/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/udf/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/ufm/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/uftdi/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/umct/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/uplcom/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/uvisor/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/uvscom/Makefile#3 integrate
.. //depot/projects/smpng/sys/net/if_atmsubr.c#15 integrate
.. //depot/projects/smpng/sys/net/route.c#18 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.h#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.c#12 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#41 integrate
.. //depot/projects/smpng/sys/netinet/ip_icmp.c#23 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#48 integrate
.. //depot/projects/smpng/sys/netinet/tcp.h#3 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#44 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#41 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#24 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#18 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#17 integrate
.. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#9 integrate
.. //depot/projects/smpng/sys/netinet6/in6_pcb.c#26 integrate
.. //depot/projects/smpng/sys/netinet6/ipsec.c#13 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#19 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#64 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#51 integrate
.. //depot/projects/smpng/sys/pci/if_dcreg.h#21 integrate
.. //depot/projects/smpng/sys/pci/ncr.c#13 integrate
.. //depot/projects/smpng/sys/powerpc/include/nexusvar.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/psim/ata_iobus.c#5 integrate
.. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#1 branch
.. //depot/projects/smpng/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/smpng/sys/sparc64/include/ofw_machdep.h#4 integrate
.. //depot/projects/smpng/sys/sparc64/include/sysarch.h#3 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/ofw_machdep.c#6 integrate
.. //depot/projects/smpng/sys/sys/filedesc.h#19 integrate
.. //depot/projects/smpng/sys/sys/libkern.h#11 integrate
.. //depot/projects/smpng/sys/vm/vm_contig.c#19 integrate
.. //depot/projects/smpng/sys/vm/vm_extern.h#18 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#24 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#46 integrate

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#26 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -351,7 +351,7 @@
 	boot_cpu_id = PCPU_GET(cpuid);
 	KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id,
 	    ("cpu_mp_probe() called on non-primary CPU"));
-	all_cpus = 1 << boot_cpu_id;
+	all_cpus = PCPU_GET(cpumask);
 
 	mp_ncpus = 1;
 
@@ -413,12 +413,12 @@
 		all_cpus |= (1 << i);
 		mp_ncpus++;
 	}
-	PCPU_SET(other_cpus, all_cpus & ~(1 << boot_cpu_id));
+	PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask));
 
 	for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) {
 		if (i == boot_cpu_id)
 			continue;
-		if (all_cpus & (1 << i))
+		if (!CPU_ABSENT(i))
 			smp_start_secondary(i);
 	}
 }
@@ -476,7 +476,7 @@
 void
 ipi_self(u_int64_t ipi)
 {
-	ipi_selected(1 << PCPU_GET(cpuid), ipi);
+	ipi_selected(PCPU_GET(cpumask), ipi);
 }
 
 /*
@@ -489,7 +489,7 @@
 	u_int64_t ipi;
 	int cpumask;
 
-	cpumask = 1 << PCPU_GET(cpuid);
+	cpumask = PCPU_GET(cpumask);
 
 	CTR1(KTR_SMP, "smp_handle_ipi(), ipis=%lx", ipis);
 	while (ipis) {

==== //depot/projects/smpng/sys/alpha/include/sysarch.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.6 2002/03/20 18:58:45 obrien Exp $
+ * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.7 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -52,6 +52,7 @@
 
 __BEGIN_DECLS
 int		alpha_sethae(u_int64_t);
+int		sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/smpng/sys/amd64/include/profile.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/amd64/include/profile.h,v 1.32 2003/06/02 00:28:39 obrien Exp $
+ * $FreeBSD: src/sys/amd64/include/profile.h,v 1.33 2004/01/06 20:36:21 nectar Exp $
  */
 
 #ifndef _MACHINE_PROFILE_H_
@@ -148,7 +148,6 @@
 #ifdef __GNUC__
 void	mcount(void) __asm(".mcount");
 #endif
-static void	_mcount(uintfptr_t frompc, uintfptr_t selfpc);
 __END_DECLS
 
 #endif /* _KERNEL */

==== //depot/projects/smpng/sys/amd64/include/sysarch.h#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.21 2003/10/23 06:06:14 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.22 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -50,9 +50,10 @@
 
 __BEGIN_DECLS
 int amd64_get_fsbase(void **);
+int amd64_get_gsbase(void **);
 int amd64_set_fsbase(void *);
-int amd64_get_gsbase(void **);
 int amd64_set_gsbase(void *);
+int sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/smpng/sys/boot/forth/beastie.4th#6 (text+ko) ====

@@ -23,7 +23,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $
 
 marker task-beastie.4th
 
@@ -228,6 +228,7 @@
 				s" acpi_load" unsetenv
 				s" 1" s" hint.acpi.0.disabled" setenv
 				s" 1" s" loader.acpi_disabled_by_user" setenv
+				s" 1" s" hint.apic.0.disabled" setenv
 			then
 			s" 0" s" hw.ata.ata_dma" setenv
 			s" 0" s" hw.ata.atapi_dma" setenv

==== //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#3 (text+ko) ====

@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.10 2003/12/11 22:42:50 jhb Exp $
+# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.11 2004/01/12 20:34:42 jhb Exp $
 
 #
 # This program is a freestanding boot program to load an a.out binary
@@ -165,7 +165,7 @@
 #
 		mov DIR_SIZE(%bx),%eax		# Read file length
 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors
-		shr $11,%eax
+		shr $SECTOR_SHIFT,%eax
 		cmp $BUFFER_LEN,%eax
 		jbe load_sizeok
 		mov $msg_load2big,%si		# Error message
@@ -400,6 +400,7 @@
 # Trashes: EAX
 #
 read:		push %si			# Save
+		push %cx			# Save since some BIOSs trash
 		mov %eax,edd_lba		# LBA to read from
 		mov %ebx,%eax			# Convert address
 		shr $4,%eax			#  to segment
@@ -413,7 +414,8 @@
 		int $0x13			# Call BIOS
 		pop %dx				# Restore
 		jc read.fail			# Worked?
-		pop %si				# Restore
+		pop %cx				# Restore
+		pop %si
 		ret				# Return
 read.fail:	cmp $ERROR_TIMEOUT,%ah		# Timeout?
 		je read.retry			# Yes, Retry.
@@ -460,6 +462,7 @@
 		mov twiddle_chars,%bx		# Address table
 		inc %al				# Next
 		and $3,%al			#  char
+		mov %al,twiddle_index		# Save index for next call
 		xlat				# Get char
 		call putc			# Output it
 		mov $8,%al			# Backspace

==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#36 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.80 2004/01/02 19:29:31 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.81 2004/01/12 03:14:37 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -352,7 +352,7 @@
 	/* resolve symlinks etc. in the emulation tree prefix */
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
-	if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) == -1)
+	if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) != 0)
 		lep = linux_emul_path;
 	else
 		lep = dlep;

==== //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.22 2004/01/06 07:09:26 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.28 2004/01/12 21:40:05 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -151,7 +151,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 
-	device_printf (block->nmb_dev, "status: %x\n", status);
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "status: %x\n", status);
 	return;
 }
 
@@ -162,7 +163,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 	
-	device_printf (block->nmb_dev, "status complete\n");
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "status complete\n");
 	return;
 }
 
@@ -201,7 +203,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 
-	device_printf (block->nmb_dev, "reset done...\n");
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "reset done...\n");
 	return;
 }
 
@@ -305,17 +308,17 @@
 	    "NDIS API Version", "0x00050001", CTLFLAG_RD);
 
 	/* Bus type (PCI, PCMCIA, etc...) */
-	sprintf(buf, "%d\n", (int)sc->ndis_iftype);
+	sprintf(buf, "%d", (int)sc->ndis_iftype);
 	ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
 
 	if (sc->ndis_res_io != NULL) {
-		sprintf(buf, "0x%lx\n", rman_get_start(sc->ndis_res_io));
+		sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
 		ndis_add_sysctl(sc, "IOBaseAddress",
 		    "Base I/O Address", buf, CTLFLAG_RD);
 	}
 
 	if (sc->ndis_irq != NULL) {
-		sprintf(buf, "%lu\n", rman_get_start(sc->ndis_irq));
+		sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
 		ndis_add_sysctl(sc, "InterruptNumber",
 		    "Interrupt Number", buf, CTLFLAG_RD);
 	}
@@ -600,6 +603,7 @@
 	priv = &(*p)->np_private;
 	priv->npp_totlen = m0->m_pkthdr.len;
         priv->npp_packetooboffset = offsetof(ndis_packet, np_oob);
+	priv->npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
 
 	for (m = m0; m != NULL; m = m->m_next) {
 		if (m->m_len == 0)
@@ -704,6 +708,8 @@
 	return(0);
 }
 
+typedef void (*ndis_senddone_func)(ndis_handle, ndis_packet *, ndis_status);
+
 int
 ndis_send_packets(arg, packets, cnt)
 	void			*arg;
@@ -713,14 +719,14 @@
 	struct ndis_softc	*sc;
 	ndis_handle		adapter;
 	__stdcall ndis_sendmulti_handler	sendfunc;
-	int			i, idx;
-	struct ifnet		*ifp;
-	struct mbuf		*m;
+	__stdcall ndis_senddone_func		senddonefunc;
+	int			i;
 	ndis_packet		*p;
 
 	sc = arg;
 	adapter = sc->ndis_block.nmb_miniportadapterctx;
 	sendfunc = sc->ndis_chars.nmc_sendmulti_func;
+	senddonefunc = sc->ndis_block.nmb_senddone_func;
 	sendfunc(adapter, packets, cnt);
 
 	for (i = 0; i < cnt; i++) {
@@ -733,21 +739,7 @@
 		 */
 		if (p == NULL || p->np_oob.npo_status == NDIS_STATUS_PENDING)
 			continue;
-		idx = p->np_txidx;
-		m = p->np_m0;
-		ifp = &sc->arpcom.ac_if;
-		if (sc->ndis_sc)
-			bus_dmamap_unload(sc->ndis_ttag, sc->ndis_tmaps[idx]);
-		sc->ndis_txarray[idx] = NULL;
-		sc->ndis_txpending++;
-		m_freem(m);
-		ndis_free_packet(p);
-		if (p->np_oob.npo_status == NDIS_STATUS_SUCCESS)
-			ifp->if_opackets++;
-		else
-			ifp->if_oerrors++;
-		ifp->if_timer = 0;
-		ifp->if_flags &= ~IFF_OACTIVE;
+		senddonefunc(&sc->ndis_block, p, p->np_oob.npo_status);
 	}
 
 	return(0);
@@ -1092,6 +1084,8 @@
 	return(0);
 }
 
+#define NDIS_LOADED		0x42534F44
+
 int
 ndis_load_driver(img, arg)
 	vm_offset_t		img;
@@ -1110,22 +1104,34 @@
 
 	sc = arg;
 
-	/* Perform text relocation */
-	if (pe_relocate(img))
-		return(ENOEXEC);
+	/*
+	 * Only perform the relocation/linking phase once
+	 * since the binary image may be shared among multiple
+	 * device instances.
+	 */
 
-        /* Dynamically link the NDIS.SYS routines -- required. */
-	if (pe_patch_imports(img, "NDIS", ndis_functbl))
-		return(ENOEXEC);
+	ptr = (uint32_t *)(img + 8);
+	if (*ptr != NDIS_LOADED) {
+		/* Perform text relocation */
+		if (pe_relocate(img))
+			return(ENOEXEC);
 
-	/* Dynamically link the HAL.dll routines -- also required. */
-	if (pe_patch_imports(img, "HAL", hal_functbl))
-		return(ENOEXEC);
+		/* Dynamically link the NDIS.SYS routines -- required. */
+		if (pe_patch_imports(img, "NDIS", ndis_functbl))
+			return(ENOEXEC);
 
-	/* Dynamically link ntoskrnl.exe -- optional. */
-	if (pe_get_import_descriptor(img, &imp_desc, "ntoskrnl") == 0) {
-		if (pe_patch_imports(img, "ntoskrnl", ntoskrnl_functbl))
+		/* Dynamically link the HAL.dll routines -- also required. */
+		if (pe_patch_imports(img, "HAL", hal_functbl))
 			return(ENOEXEC);
+
+		/* Dynamically link ntoskrnl.exe -- optional. */
+		if (pe_get_import_descriptor(img,
+		    &imp_desc, "ntoskrnl") == 0) {
+			if (pe_patch_imports(img,
+			    "ntoskrnl", ntoskrnl_functbl))
+				return(ENOEXEC);
+		}
+		*ptr = NDIS_LOADED;
 	}
 
         /* Locate the driver entry point */

==== //depot/projects/smpng/sys/compat/ndis/ndis_var.h#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.12 2004/01/06 07:09:26 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.15 2004/01/12 03:49:20 wpaul Exp $
  */
 
 #ifndef _NDIS_VAR_H_
@@ -443,7 +443,7 @@
 
 struct ndis_80211_bssid_list_ex {
 	uint32_t		nblx_items;
-	ndis_wlan_bssid		nblx_bssid[1];
+	ndis_wlan_bssid_ex	nblx_bssid[1];
 };
 
 typedef struct ndis_80211_bssid_list_ex ndis_80211_bssid_list_ex;
@@ -808,7 +808,7 @@
  */
 struct ndis_miniport_interrupt {
 	void			*ni_introbj;
-	ndis_spin_lock		ni_dpccountlock;
+	ndis_kspin_lock		ni_dpccountlock;
 	void			*ni_rsvd;
 	void			*ni_isrfunc;
 	void			*ni_dpcfunc;
@@ -919,6 +919,10 @@
 #define NDIS_FLAGS_SENT_AT_DPC                  0x00001000
 #define NDIS_FLAGS_USES_SG_BUFFER_LIST          0x00002000
 
+#define NDIS_PACKET_WRAPPER_RESERVED			0x3F
+#define NDIS_PACKET_CONTAINS_MEDIA_SPECIFIC_INFO	0x40
+#define NDIS_PACKET_ALLOCATED_BY_NDIS			0x80
+
 #define NDIS_PROTOCOL_ID_DEFAULT        0x00
 #define NDIS_PROTOCOL_ID_TCP_IP         0x02
 #define NDIS_PROTOCOL_ID_IPX            0x06
@@ -1157,6 +1161,14 @@
 
 TAILQ_HEAD(nte_head, ndis_timer_entry);
 
+struct ndis_fh {
+	void			*nf_vp;
+	void			*nf_map;
+	uint32_t		nf_maplen; 
+};
+
+typedef struct ndis_fh ndis_fh;
+
 /*
  * The miniport block is basically the internal NDIS handle. We need
  * to define this because, unfortunately, it is not entirely opaque

==== //depot/projects/smpng/sys/compat/ndis/subr_hal.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.3 2004/01/03 09:20:48 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.4 2004/01/12 03:49:20 wpaul Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -82,6 +82,8 @@
 __stdcall static uint8_t hal_irql(void);
 __stdcall static void dummy (void);
 
+extern struct mtx_pool *ndis_mtxpool;
+
 __stdcall static void
 hal_stall_exec_cpu(usecs)
 	uint32_t		usecs;
@@ -211,7 +213,7 @@
 
 	__asm__ __volatile__ ("" : "=c" (lock));
 
-	mtx_lock((struct mtx *)*lock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)*lock);
 	return(0);
 }
 
@@ -223,7 +225,7 @@
 
 	__asm__ __volatile__ ("" : "=c" (lock), "=d" (newiqrl));
 
-	mtx_unlock((struct mtx *)*lock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)*lock);
 	return;
 }
 

==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.27 2004/01/06 18:06:54 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.34 2004/01/13 01:12:28 wpaul Exp $");
 
 /*
  * This file implements a translation layer between the BSD networking
@@ -65,6 +65,10 @@
 #include <sys/smp.h>
 #include <sys/queue.h>
 #include <sys/taskqueue.h>
+#include <sys/proc.h>
+#include <sys/namei.h>
+#include <sys/fcntl.h>
+#include <sys/vnode.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -72,6 +76,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
+#include <machine/atomic.h>
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
@@ -98,7 +103,12 @@
 #define __stdcall __attribute__((__stdcall__))
 #define FUNC void(*)(void)
 
-static struct mtx ndis_interlock;
+static struct mtx *ndis_interlock;
+static char ndis_filepath[MAXPATHLEN];
+struct mtx_pool *ndis_mtxpool;
+
+SYSCTL_STRING(_hw, OID_AUTO, ndis_filepath, CTLFLAG_RW, ndis_filepath,
+        MAXPATHLEN, "Path used by NdisOpenFile() to search for files");
 
 __stdcall static void ndis_initwrap(ndis_handle,
 	ndis_driver_object *, void *, void *);
@@ -269,16 +279,17 @@
 int
 ndis_libinit()
 {
-	mtx_init(&ndis_interlock, "ndislock", MTX_NETWORK_LOCK,
-	    MTX_DEF | MTX_RECURSE | MTX_DUPOK);
-
+	strcpy(ndis_filepath, "/compat/ndis");
+	ndis_mtxpool = mtx_pool_create("ndis mutex pool",
+	    1024, MTX_DEF | MTX_RECURSE | MTX_DUPOK);;
+	ndis_interlock = mtx_pool_alloc(ndis_mtxpool);
 	return(0);
 }
 
 int
 ndis_libfini()
 {
-	mtx_destroy(&ndis_interlock);
+	mtx_pool_destroy(&ndis_mtxpool);
 	return(0);
 }
 
@@ -668,15 +679,7 @@
 ndis_create_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	struct mtx		*mtx;
-
-	mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (mtx == NULL)
-		return;
-	mtx_init(mtx, "ndislock", "ndis spin lock",
-	    MTX_DEF | MTX_RECURSE | MTX_DUPOK);
-	lock->nsl_spinlock = (ndis_kspin_lock)mtx;
-
+	lock->nsl_spinlock = (ndis_kspin_lock)mtx_pool_alloc(ndis_mtxpool);
 	return;
 }
 
@@ -684,13 +687,7 @@
 ndis_destroy_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	struct mtx		*ndis_mtx;
-
-	ndis_mtx = (struct mtx *)lock->nsl_spinlock;
-	mtx_destroy(ndis_mtx);
-	free(ndis_mtx, M_DEVBUF);
-	lock->nsl_spinlock = 0xdeadf00d; /* XXX */
-
+	/* We use a mutex pool, so this is a no-op. */
 	return;
 }
 
@@ -698,32 +695,7 @@
 ndis_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	if (lock == NULL)
-		return;
-	/*
-	 * Workaround for certain broken NDIS drivers. I have
-	 * encountered one case where a driver creates a spinlock
-	 * within its DriverEntry() routine, which is then destroyed
-	 * in its MiniportHalt() routine. This is a bug, because
-	 * MiniportHalt() is meant to only destroy what MiniportInit()
-	 * creates. This leads to the following problem:
-	 *     DriverEntry() <- spinlock created
-	 *     MiniportInit() <- NIC initialized
-	 *     MiniportHalt() <- NIC halted, spinlock destroyed
-	 *     MiniportInit() <- NIC initialized, spinlock not recreated
-	 *     NdisAcquireSpinLock(boguslock) <- panic
-	 * To work around this, we poison the spinlock on destroy, and
-	 * if we try to re-acquire the poison pill^Wspinlock, we init
-	 * it again so subsequent calls will work.
-	 *
-	 * Drivers that behave in this way are likely not officially
-	 * certified by Microsoft, since their I would expect the
-	 * Microsoft NDIS test tool to catch mistakes like this.
-	 */
-	if (lock->nsl_spinlock == 0xdeadf00d)
-		ndis_create_lock(lock);
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
-
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	return;
 }
 
@@ -731,10 +703,7 @@
 ndis_unlock(lock)
 	ndis_spin_lock		*lock;
 {
-	if (lock == NULL)
-		return;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
-
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	return;
 }
 
@@ -789,6 +758,7 @@
  * The errorlog routine uses a variable argument list, so we
  * have to declare it this way.
  */
+#define ERRMSGLEN 512
 static void
 ndis_syslog(ndis_handle adapter, ndis_error_code code,
 	uint32_t numerrors, ...)
@@ -798,12 +768,15 @@
 	int			i, error;
 	char			*str = NULL, *ustr = NULL;
 	uint16_t		flags;
+	char			msgbuf[ERRMSGLEN];
 
 	block = (ndis_miniport_block *)adapter;
 
 	error = pe_get_message(block->nmb_img, code, &str, &i, &flags);
 	if (error == 0 && flags & MESSAGE_RESOURCE_UNICODE) {
-		ndis_unicode_to_ascii((uint16_t *)str, i, &ustr);
+		ustr = msgbuf;
+		ndis_unicode_to_ascii((uint16_t *)str,
+		    ((i / 2)) > (ERRMSGLEN - 1) ? ERRMSGLEN : i, &ustr);
 		str = ustr;
 	}
 	device_printf (block->nmb_dev, "NDIS ERROR: %x (%s)\n", code,
@@ -816,8 +789,6 @@
 		    va_arg(ap, void *));
 	va_end(ap);
 
-	if (ustr != NULL)
-		free(ustr, M_DEVBUF);
 	return;
 }
 
@@ -1098,7 +1069,8 @@
 	if (sc->ndis_res_io == NULL)
 		return(NDIS_STATUS_FAILURE);
 
-	if (rman_get_size(sc->ndis_res_io) != numports)
+	/* Don't let the device map more ports than we have. */
+	if (rman_get_size(sc->ndis_res_io) < numports)
 		return(NDIS_STATUS_INVALID_LENGTH);
 
 	*offset = (void *)rman_get_start(sc->ndis_res_io);
@@ -1536,6 +1508,13 @@
 	pkt->np_private.npp_packetooboffset =
 	    offsetof(ndis_packet, np_oob);
 
+	/*
+	 * We must initialize the packet flags correctly in order
+	 * for the NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO() and
+	 * NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO() to work correctly.
+	 */
+	pkt->np_private.npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
+
 	*packet = pkt;
 
 	head->np_private.npp_count++;
@@ -1780,9 +1759,7 @@
 ndis_interlock_inc(addend)
 	uint32_t		*addend;
 {
-	mtx_lock(&ndis_interlock);
-	*addend++;
-	mtx_unlock(&ndis_interlock);
+	atomic_add_long((u_long *)addend, 1);
 	return(*addend);
 }
 
@@ -1790,9 +1767,7 @@
 ndis_interlock_dec(addend)
 	uint32_t		*addend;
 {
-	mtx_lock(&ndis_interlock);
-	*addend--;
-	mtx_unlock(&ndis_interlock);
+	atomic_subtract_long((u_long *)addend, 1);
 	return(*addend);
 }
 
@@ -2087,13 +2062,13 @@
 {
 	ndis_list_entry		*flink;
 
-	mtx_lock_spin((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	flink = head->nle_flink;
 	entry->nle_flink = flink;
 	entry->nle_blink = head;
 	flink->nle_blink = entry;
 	head->nle_flink = entry;
-	mtx_unlock_spin((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(flink);
 }
@@ -2106,12 +2081,12 @@
 	ndis_list_entry		*flink;
 	ndis_list_entry		*entry;
 
-	mtx_lock_spin((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	entry = head->nle_flink;
 	flink = entry->nle_flink;
 	head->nle_flink = flink;
 	flink->nle_blink = head;
-	mtx_unlock_spin((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(entry);
 }
@@ -2124,13 +2099,13 @@
 {
 	ndis_list_entry		*blink;
 
-	mtx_lock_spin((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	blink = head->nle_blink;
 	entry->nle_flink = head;
 	entry->nle_blink = blink;
 	blink->nle_flink = entry;
 	head->nle_blink = entry;
-	mtx_unlock_spin((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(blink);
 }
@@ -2150,9 +2125,9 @@
 
 	sc = (struct ndis_softc *)intr->ni_block->nmb_ifp;
 	sync = syncfunc;
-	mtx_lock(&sc->ndis_intrmtx);
+	mtx_pool_lock(ndis_mtxpool, sc->ndis_intrmtx);
 	rval = sync(syncctx);
-	mtx_unlock(&sc->ndis_intrmtx);
+	mtx_pool_unlock(ndis_mtxpool, sc->ndis_intrmtx);
 
 	return(rval);
 }
@@ -2324,12 +2299,50 @@
 	ndis_physaddr		highestaddr;
 {
 	char			*afilename = NULL;
+	struct thread		*td = curthread;
+	struct nameidata	nd;
+	int			flags, error;
+	struct vattr		vat;
+	struct vattr		*vap = &vat;
+	ndis_fh			*fh;
+	char			path[MAXPATHLEN];
 
-	ndis_unicode_to_ascii(filename->nus_buf, filename->nus_len, &afilename);
-	printf("ndis_open_file(\"%s\", %ju)\n", afilename,
-	    highestaddr.np_quad);
+	ndis_unicode_to_ascii(filename->nus_buf,
+	    filename->nus_len, &afilename);
+
+	sprintf(path, "%s/%s", ndis_filepath, afilename);
 	free(afilename, M_DEVBUF);
-	*status = NDIS_STATUS_FILE_NOT_FOUND;
+
+	fh = malloc(sizeof(ndis_fh), M_TEMP, M_NOWAIT);
+	if (fh == NULL) {
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+
+	mtx_lock(&Giant);
+	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td);
+
+	flags = FREAD;
+	error = vn_open(&nd, &flags, 0, -1);
+	if (error) {
+		mtx_unlock(&Giant);
+		*status = NDIS_STATUS_FILE_NOT_FOUND;
+		free(fh, M_TEMP);
+		return;
+	}
+
+	NDFREE(&nd, NDF_ONLY_PNBUF);
+
+	/* Get the file size. */
+	VOP_GETATTR(nd.ni_vp, vap, NOCRED, td);
+	VOP_UNLOCK(nd.ni_vp, 0, td);
+	mtx_unlock(&Giant);
+
+	fh->nf_vp = nd.ni_vp;
+	fh->nf_map = NULL;
+	*filehandle = fh;
+	*filelength = fh->nf_maplen = vap->va_size & 0xFFFFFFFF;
+	*status = NDIS_STATUS_SUCCESS;
 	return;
 }
 
@@ -2339,8 +2352,46 @@
 	void			**mappedbuffer;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Jan 13 14:43:57 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85DDB16A4D0; Tue, 13 Jan 2004 14:43:57 -0800 (PST)
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 5E95616A4CF
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 14:43:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CE8DE43D2D
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 14:43:44 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0DMhi0B069474
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 14:43:44 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0DMhinl069471
	for perforce@freebsd.org; Tue, 13 Jan 2004 14:43:44 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 13 Jan 2004 14:43:44 -0800 (PST)
Message-Id: <200401132243.i0DMhinl069471@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45303 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: Tue, 13 Jan 2004 22:43:58 -0000

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

Change 45303 by sam@sam_ebb on 2004/01/13 14:43:28

	o beware of non-existent rate codes when filling in the hwmap
	o beware of a node not have a rate set when setting up the
	  rate control state; this can happen prior to association
	  but is ok since we should only be sending management frames
	  during that time

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#14 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#14 (text+ko) ====

@@ -2781,8 +2781,11 @@
 	for (i = 0; i < rt->rateCount; i++)
 		sc->sc_rixmap[rt->info[i].dot11Rate & IEEE80211_RATE_VAL] = i;
 	memset(sc->sc_hwmap, 0, sizeof(sc->sc_hwmap));
-	for (i = 0; i < 32; i++)
-		sc->sc_hwmap[i] = rt->info[rt->rateCodeToIndex[i]].dot11Rate;
+	for (i = 0; i < 32; i++) {
+		u_int8_t ix = rt->rateCodeToIndex[i];
+		if (ix != 0xff)
+			sc->sc_hwmap[i] = rt->info[ix].dot11Rate;
+	}
 	sc->sc_currates = rt;
 	sc->sc_curmode = mode;
 	/* NB: caller is responsible for reseting rate control state */
@@ -2799,17 +2802,27 @@
 
 	DPRINTF(ATH_DEBUG_RATE, ("%s: set xmit rate for %s to %dM\n",
 	    __func__, ether_sprintf(ni->ni_macaddr),
-	    (ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2));
+	    ni->ni_rates.rs_nrates > 0 ?
+		(ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2 : 0));
 
 	ni->ni_txrate = rate;
+	/* XXX management/control frames always go at the lowest speed */
+	an->an_tx_mgtrate = rt->info[0].rateCode;
+	an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble;
+	/*
+	 * Before associating a node has no rate set setup
+	 * so we can't calculate any transmit codes to use.
+	 * This is ok since we should never be sending anything
+	 * but management frames and those always go at the
+	 * lowest hardware rate.
+	 */
+	if (ni->ni_rates.rs_nrates == 0)
+		goto done;
 	an->an_tx_rix0 = sc->sc_rixmap[
 		ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL];
 	an->an_tx_rate0 = rt->info[an->an_tx_rix0].rateCode;
 	an->an_tx_rate0sp = an->an_tx_rate0 |
 		rt->info[an->an_tx_rix0].shortPreamble;
-	/* XXX management/control frames always go at the lowest speed */
-	an->an_tx_mgtrate = rt->info[0].rateCode;
-	an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble;
 	if (sc->sc_mrretry) {
 		/*
 		 * Hardware supports multi-rate retry; setup two
@@ -2851,6 +2864,7 @@
 		an->an_tx_rate2 = an->an_tx_rate2sp = 0;
 		an->an_tx_rate3 = an->an_tx_rate3sp = 0;
 	}
+done:
 	an->an_tx_ok = an->an_tx_err = an->an_tx_retr = an->an_tx_upper = 0;
 }
 

From owner-p4-projects@FreeBSD.ORG  Tue Jan 13 19:00:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AE86816A4D0; Tue, 13 Jan 2004 19:00:04 -0800 (PST)
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 8254D16A4CE
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 19:00:04 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7E3B043D5E
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 19:00:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0E3020B032760
	for <perforce@freebsd.org>; Tue, 13 Jan 2004 19:00:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0E302N6032757
	for perforce@freebsd.org; Tue, 13 Jan 2004 19:00:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Jan 2004 19:00:02 -0800 (PST)
Message-Id: <200401140300.i0E302N6032757@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45316 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, 14 Jan 2004 03:00:05 -0000

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

Change 45316 by rwatson@rwatson_paprika on 2004/01/13 18:59:23

	Don't return a return value from kau_close() -- it's not
	generated or used.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#4 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#4 (text+ko) ====

@@ -128,7 +128,7 @@
  */
 struct au_record 	*kau_open(void);
 int			kau_write(struct au_record *rec, token_t *m);
-int			kau_close(struct au_record *rec, 
+void			kau_close(struct au_record *rec, 
 				 struct timespec *endtime, short event);
 void			kau_free(struct au_record *rec);
 void			kau_init(void);

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#8 (text+ko) ====

@@ -149,7 +149,8 @@
  * Close out the audit record by adding the header token, identifying 
  * any missing tokens.  Write out the tokens to the record memory.
  */
-int kau_close(struct au_record *rec, struct timespec *ctime, short event)
+void
+kau_close(struct au_record *rec, struct timespec *ctime, short event)
 {
 	u_char *dptr;
 	size_t tot_rec_size;
@@ -178,7 +179,6 @@
 			dptr += cur->len;
 		}
 	}
-	return (0);
 }
 
 /*

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 11:37:51 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C46816A4D0; Wed, 14 Jan 2004 11:37:51 -0800 (PST)
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 468A416A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 11:37:51 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5105943D48
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 11:37:49 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0EJbl0B088113
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 11:37:47 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0EJbl6w088110
	for perforce@freebsd.org; Wed, 14 Jan 2004 11:37:47 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 11:37:47 -0800 (PST)
Message-Id: <200401141937.i0EJbl6w088110@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45350 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, 14 Jan 2004 19:37:51 -0000

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

Change 45350 by rwatson@rwatson_tislabs on 2004/01/14 11:37:04

	Lost in a merge at some point: do install rc as executable in
	the MAC branch.

Affected files ...

.. //depot/projects/trustedbsd/mac/etc/Makefile#37 edit

Differences ...

==== //depot/projects/trustedbsd/mac/etc/Makefile#37 (text+ko) ====

@@ -12,7 +12,7 @@
 	inetd.conf login.access login.conf \
 	mac.conf motd netconfig network.subr networks newsyslog.conf \
 	phones profile protocols \
-	rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
+	rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
 	rc.subr remote rpc services \
 	shells sysctl.conf syslog.conf usbd.conf \
 	etc.${MACHINE_ARCH}/ttys \
@@ -33,7 +33,7 @@
 .endif
 
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
-BIN2=	netstart pccard_ether rc.suspend rc.resume rc rc.shutdown
+BIN2=	netstart pccard_ether rc rc.suspend rc.resume rc rc.shutdown
 
 MTREE=	BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
 	BSD.var.dist BSD.x11.dist BSD.x11-4.dist

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 12:07:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5999B16A4D0; Wed, 14 Jan 2004 12:07:30 -0800 (PST)
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 2A03316A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:07:30 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3AF7643D69
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:06:50 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0EK6N0B095463
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:06:23 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0EK6NKn095460
	for perforce@freebsd.org; Wed, 14 Jan 2004 12:06:23 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 12:06:23 -0800 (PST)
Message-Id: <200401142006.i0EK6NKn095460@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45352 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, 14 Jan 2004 20:07:30 -0000

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

Change 45352 by rwatson@rwatson_tislabs on 2004/01/14 12:05:33

	Add "-l" which requests a multilabel file system.

Affected files ...

.. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#12 edit
.. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#12 (text+ko) ====

@@ -45,6 +45,7 @@
 .Op Fl F Ar file
 .Op Fl f Ar frag-size
 .Op Fl i Ar bytes
+.Op Fl l
 .Op Fl m Ar percent-free
 .Op Fl n Ar rotational-positions
 .Op Fl O Ar optimization
@@ -162,6 +163,8 @@
 The fragment size of the file system in bytes.
 .It Fl i Ar bytes
 Number of bytes per inode.
+.It Fl l
+Enables multilabel MAC on the new file system.
 .It Fl L
 Show the output of the helper programs.
 By default,

==== //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#11 (text+ko) ====

@@ -118,7 +118,7 @@
 		compat = true;
 
 	while ((ch = getopt(argc, argv,
-	    "a:b:Cc:Dd:e:F:f:hi:LMm:Nn:O:o:p:Ss:t:Uv:w:X")) != -1)
+	    "a:b:Cc:Dd:e:F:f:hi:LlMm:Nn:O:o:p:Ss:t:Uv:w:X")) != -1)
 		switch (ch) {
 		case 'a':
 			argappend(&newfs_arg, "-a %s", optarg);
@@ -166,6 +166,9 @@
 				usage();
 			loudsubs = true;
 			break;
+		case 'l':
+			argappend(&newfs_arg, "-l");
+			break;
 		case 'M':
 			if (have_mdtype)
 				usage();

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 12:24:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BDC216A4D2; Wed, 14 Jan 2004 12:24:00 -0800 (PST)
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 D0FBA16A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:23:59 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 52CD843D6D
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:22:42 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0EKLg0B099005
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 12:21:42 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0EKLgic098999
	for perforce@freebsd.org; Wed, 14 Jan 2004 12:21:42 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 12:21:42 -0800 (PST)
Message-Id: <200401142021.i0EKLgic098999@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45353 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, 14 Jan 2004 20:24:00 -0000

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

Change 45353 by rwatson@rwatson_tislabs on 2004/01/14 12:21:39

	Create /var and /tmp as multi-label file systems, and perform
	a touch of initial labeling.  This was lost when rc.diskless[12]
	moved to rcNG bits.

Affected files ...

.. //depot/projects/trustedbsd/mac/etc/rc.d/diskless#11 edit
.. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/etc/rc.d/diskless#11 (text+ko) ====

@@ -47,7 +47,7 @@
 	if [ -n "$3" ]; then
 		bpi="-i $3"
 	fi
-	/sbin/mdmfs $bpi -s $1 -M md $2
+	/sbin/mdmfs $bpi -s $1 -l -M md $2
 }
 
 # If there is a global system configuration file, suck it in.
@@ -95,6 +95,15 @@
 	;;
 esac
 
+if sysctl security.mac > /dev/null 2>&1 ; then
+	setfmac biba/equal,mls/equal,te/equal /var/tmp
+	setfmac biba/equal,mls/equal,te/equal /var/tmp/vi.recover
+	setfmac biba/equal,mls/equal,te/equal /var/spool/lock
+	setfmac biba/equal,mls/equal,te/mailqueue_t /var/spool/mqueue
+	setfmac biba/equal,mls/equal,te/maildir_t /var/mail
+	setfmac biba/equal,mls/equal,te/equal /var/run
+fi
+
 echo "+++ create log files based on the contents of /etc/newsyslog.conf"
 LOGFILES=`/usr/bin/awk '$1 != "#" { printf "%s ", $1 } ' /etc/newsyslog.conf`
 if [ -n "$LOGFILES" ]; then

==== //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#11 (text+ko) ====

@@ -103,7 +103,7 @@
 # Create a generic memory disk
 #
 mount_md() {
-    /sbin/mdmfs -i 4096 -s $1 -M md $2
+    /sbin/mdmfs -i 4096 -s $1 -l -M md $2
 }
 
 # Create the memory filesystem if it has not already been created

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 13:26:09 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F8DC16A4D0; Wed, 14 Jan 2004 13:26:09 -0800 (PST)
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 4AB6216A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:26:09 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5E57B43D68
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:26:03 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0ELQ30B019417
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:26:03 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0ELQ225019414
	for perforce@freebsd.org; Wed, 14 Jan 2004 13:26:02 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 13:26:02 -0800 (PST)
Message-Id: <200401142126.i0ELQ225019414@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45358 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, 14 Jan 2004 21:26:09 -0000

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

Change 45358 by rwatson@rwatson_tislabs on 2004/01/14 13:25:02

	Clean up from changes to vn_fullpath().

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ====

@@ -348,8 +348,8 @@
 	struct nameidata nd;
 	struct mount *mp;
 	const char *lep;
-	char *dlep, *flep, *mntto, *mntfrom, *fstype;
-	char *fullpath, *lep;
+	char *flep, *mntto, *mntfrom, *fstype;
+	char *fullpath;
 	size_t lep_len;
 	int error;
 
@@ -405,7 +405,7 @@
 		sbuf_printf(sb, " 0 0\n");
 	}
 	mtx_unlock(&mountlist_mtx);
-	free(fullpath);
+	free(fullpath, M_TEMP);
 	return (error);
 }
 
@@ -764,7 +764,7 @@
 		sbuf_printf(sb, "%s", fullpath);
 	else
 		sbuf_printf(sb, "unknown");
-	free(fullpath);
+	free(fullpath, M_TEMP);
 	return (0);
 }
 
@@ -857,7 +857,6 @@
 	    ((uio->uio_resid > 0) && (entry != &map->header));
 	    entry = entry->next) {
 		name = "";
-		freename = NULL;
 		if (entry->eflags & MAP_ENTRY_IS_SUB_MAP)
 			continue;
 		obj = entry->object.vm_object;
@@ -917,7 +916,7 @@
 	}
 	if (map != &curthread->td_proc->p_vmspace->vm_map)
 		vm_map_unlock_read(map);
-	free(fullpath);
+	free(fullpath, M_TEMP);
 	return (error);
 }	
 	

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 13:39:39 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 885C816A4CF; Wed, 14 Jan 2004 13:39:39 -0800 (PST)
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 4BEE116A4D0
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:39:39 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 135C743D82
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:38:22 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0ELcJ0B021655
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:38:19 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0ELcIws021652
	for perforce@freebsd.org; Wed, 14 Jan 2004 13:38:18 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 13:38:18 -0800 (PST)
Message-Id: <200401142138.i0ELcIws021652@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45360 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, 14 Jan 2004 21:39:39 -0000

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

Change 45360 by rwatson@rwatson_tislabs on 2004/01/14 13:38:17

	Break out memory allocation in audit_proc_init() and
	audit_proc_fork()  into audit_proc_alloc() to match
	audit_proc_free().  This allows us to avoid memory
	allocation while holding the process mutex.  While here,
	assert the process mutex for parent and child when
	forking, since we currently believe p_au and contents will
	be protected by that lock.  While here, fix a memory leak
	in the MAC code from when process creation fails.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/kern/init_main.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_fork.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#12 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#11 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/kern/init_main.c#3 (text+ko) ====

@@ -398,6 +398,7 @@
 	p->p_ucred->cr_ruidinfo = uifind(0);
 	p->p_ucred->cr_prison = NULL;	/* Don't jail it. */
 #ifdef AUDIT
+	audit_proc_alloc(p);
 	audit_proc_init(p);
 #endif
 #ifdef MAC

==== //depot/projects/trustedbsd/audit2/sys/kern/kern_fork.c#3 (text+ko) ====

@@ -290,6 +290,9 @@
 #ifdef MAC
 	mac_init_proc(newproc);
 #endif
+#ifdef AUDIT
+	audit_proc_alloc(newproc);
+#endif
 
 	/*
 	 * Although process entries are dynamically created, we still keep
@@ -739,6 +742,12 @@
 		printf("maxproc limit exceeded by uid %i, please see tuning(7) and login.conf(5).\n",
 			uid);
 	sx_xunlock(&allproc_lock);
+#ifdef MAC
+	mac_proc_destroy(newproc);
+#endif
+#ifdef AUDIT
+	audit_proc_free(newproc);
+#endif
 	uma_zfree(proc_zone, newproc);
 	if (p1->p_flag & P_SA) {
 		PROC_LOCK(p1);

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#12 (text+ko) ====

@@ -1251,6 +1251,16 @@
 	ar->k_ar.ar_valid_arg |= ARG_SVIPC_ADDR;
 }
 
+/*
+ * Allocate storage for a new process (init, or otherwise).
+ */
+void
+audit_proc_alloc(struct proc *p)
+{
+
+	p->p_au = malloc(sizeof(*p->p_au), M_AUDIT, M_WAITOK);
+}
+
 /* 
  * Initialize the audit information for the a process, presumably the first 
  * process in the system.
@@ -1261,25 +1271,19 @@
 audit_proc_init(struct proc *p)
 {
 
-	p->p_au = malloc(sizeof(*p->p_au), M_AUDIT, M_WAITOK);
 	bzero((void *)p->p_au, sizeof(*p->p_au));
 }
 
 /* 
  * Copy the audit info from the parent process to the child process when
  * a fork takes place.
- * XXX Need to check for failure from the memory allocation, in here
- * as well as in any functions that use the process auditing info.
  */
 void
 audit_proc_fork(struct proc *parent, struct proc *child)
 {
 
-	/* Always set up the audit information pointer as this function
-	 * should only be called when the proc is new. If proc structures
-	 * are ever cached and reused, then this behavior will leak memory.
-	 */
-	child->p_au = malloc(sizeof(*child->p_au), M_AUDIT, M_WAITOK);
+	PROC_LOCK_ASSERT(parent, MA_OWNED);
+	PROC_LOCK_ASSERT(child, MA_OWNED);
 	bcopy(parent->p_au, child->p_au, sizeof(*child->p_au));
 }
 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#11 (text+ko) ====

@@ -154,6 +154,7 @@
 void			 audit_arg_svipc_id(int id);
 void			 audit_arg_svipc_addr(void *addr);
 
+void			 audit_proc_alloc(struct proc *p);
 void			 audit_proc_init(struct proc *p);
 void			 audit_proc_fork(struct proc *parent, 
 					 struct proc *child);

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 13:48:37 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B92EF16A4D0; Wed, 14 Jan 2004 13:48:36 -0800 (PST)
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 9350E16A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:48:36 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2214C43D73
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:48:33 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0ELmW0B024246
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 13:48:32 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0ELmWUa024243
	for perforce@freebsd.org; Wed, 14 Jan 2004 13:48:32 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 13:48:32 -0800 (PST)
Message-Id: <200401142148.i0ELmWUa024243@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45362 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, 14 Jan 2004 21:48:37 -0000

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

Change 45362 by rwatson@rwatson_tislabs on 2004/01/14 13:48:10

	Don't install rc.shutdown twice, it's in BIN2 in the MAC branch.
	
	Pointed out by:	cvance

Affected files ...

.. //depot/projects/trustedbsd/mac/etc/Makefile#38 edit

Differences ...

==== //depot/projects/trustedbsd/mac/etc/Makefile#38 (text+ko) ====

@@ -12,7 +12,7 @@
 	inetd.conf login.access login.conf \
 	mac.conf motd netconfig network.subr networks newsyslog.conf \
 	phones profile protocols \
-	rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
+	rc.firewall rc.firewall6 rc.sendmail \
 	rc.subr remote rpc services \
 	shells sysctl.conf syslog.conf usbd.conf \
 	etc.${MACHINE_ARCH}/ttys \

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 17:35:21 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACC2B16A4D0; Wed, 14 Jan 2004 17:35:20 -0800 (PST)
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 7991B16A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 17:35:20 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 90DEA43D49
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 17:35:16 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0F1ZG0B081189
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 17:35:16 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0F1Z7FQ081159
	for perforce@freebsd.org; Wed, 14 Jan 2004 17:35:07 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 14 Jan 2004 17:35:07 -0800 (PST)
Message-Id: <200401150135.i0F1Z7FQ081159@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45367 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: Thu, 15 Jan 2004 01:35:21 -0000

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

Change 45367 by rwatson@rwatson_tislabs on 2004/01/14 17:34:52

	Integrate the TrustedBSD audit2 branch up to about 5.2-RELEASE.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/alpha/alpha/db_instruction.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/alpha/db_trace.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/alpha/dump_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/alpha/elf_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/alpha/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/alpha/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/alpha/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/conf/GENERIC.hints#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/include/ioctl_bt848.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/include/ioctl_meteor.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/include/kse.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/alpha/include/sysarch.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/linux/linux_proto.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/linux/linux_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/linux/linux_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/linux/linux_sysvec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/linux/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/linux/syscalls.master#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/osf1/osf1_proto.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/osf1/osf1_signal.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/osf1/osf1_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/osf1/osf1_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/osf1/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/osf1/syscalls.master#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/alpha/pci/apecs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/amd64-gdbstub.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/amd64_mem.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/apic_vector.S#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/critical.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/fpu.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/mem.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/mptable.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/ia32/ia32_sigtramp.S#1 branch
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/apicreg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/critical.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/kse.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/mutex.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/param.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/pcvt_ioctl.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/profile.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/runq.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/sysarch.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/isa/atpic.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/isa/icu.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/common/conf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/common/main.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/OSFpal.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/alpha_module.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/bootinfo.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/delay.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/devicename.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/getsecs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/prom.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/reboot.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/srmdisk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/srmnet.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/alpha/libalpha/time.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/abort.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/arcconsole.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/arcdisk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/bootinfo.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/delay.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/devicename.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/elf_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/module.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/prom.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/setjmperr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/lib/time.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/loader/conf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/arc/loader/main.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/efi/include/efiapi.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/efi/libefi/bootinfo.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/efi/libefi/devicename.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/efi/libefi/efifpswa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/efi/libefi/efinet.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/efi/libefi/elf_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ficl/loader.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ficl/powerpc/sysdep.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/boot/ficl/powerpc/sysdep.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/boot/forth/beastie.4th#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/i386/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/i386/boot0/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/i386/boot0/boot0.s#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/i386/boot0/boot0sio.s#1 branch
.. //depot/projects/trustedbsd/audit2/sys/boot/i386/boot0sio/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ia64/libski/acpi_stub.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/common/main.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/devicename.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/libofw.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_console.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_copy.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_disk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_memory.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_module.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_net.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/ofw_time.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/ofw/libofw/openfirm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/powerpc/loader/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/powerpc/loader/conf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/powerpc/loader/metadata.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/powerpc/loader/start.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/sparc64/boot1/boot1.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/sparc64/loader/main.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/boot/sparc64/loader/metadata.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/cam/scsi/scsi_all.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/freebsd32_util.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/ia32/ia32_sigtramp.S#2 delete
.. //depot/projects/trustedbsd/audit2/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/ia32/ia32_util.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/cfg_var.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/hal_var.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/kern_ndis.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/ndis_var.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/ntoskrnl_var.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/pe_var.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/resource_var.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/subr_hal.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/subr_ndis.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/subr_ntoskrnl.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/ndis/subr_pe.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/svr4/svr4_sysvec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/svr4/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/compat/svr4/syscalls.master#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/Makefile.alpha#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files#4 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files.alpha#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files.amd64#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files.i386#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files.ia64#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files.pc98#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files.powerpc#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/files.sparc64#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/kern.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/kmod.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/ldscript.i386#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/majors#3 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/newvers.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/options#4 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/options.i386#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/conf/options.pc98#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acconfig.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acdisasm.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acenv.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acevents.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acexcep.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acglobal.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acmacros.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acobject.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acstruct.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/actbl.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/actbl1.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/actbl2.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/actypes.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/acutils.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/common/adisasm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dbcmds.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dbdisply.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dbexec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dbfileio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dbstats.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dbutils.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dmobject.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dmresrc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dmresrcl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dsfield.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dsinit.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dsmethod.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dsmthdat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dsopcode.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dsutils.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dswexec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dswload.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dswscope.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/dswstate.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/evgpe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/evgpeblk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/evregion.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/evrgnini.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/evxfregn.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exconfig.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/excreate.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exdump.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exfield.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exfldio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exmisc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exmutex.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exoparg1.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exoparg3.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exprep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exregion.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exresnte.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exresolv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exresop.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exstore.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exstoren.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exsystem.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/exutils.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/hwacpi.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/hwregs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/hwsleep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsaccess.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsalloc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsdump.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsinit.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsobject.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nssearch.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsutils.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/nsxfname.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/osunixxf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/psargs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/psparse.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/psxface.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/rsaddr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/rscalc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/rscreate.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/rsdump.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/rsirq.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/rslist.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/tbconvrt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/tbget.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/tbgetall.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/tbinstal.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/tbrsdt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/tbxface.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/tbxfroot.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/utalloc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/utdebug.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/utdelete.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/uteval.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/utglobal.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/acpica/utobject.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/ath/ah.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/dev/ath/version.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/Osd/OsdTable.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi_cmbat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi_package.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi_pcib.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/acpica/madt.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/ahc_eisa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/ahc_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/ahd_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7770.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic79xx.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic79xx.seq#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx.reg#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx.seq#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic_osm_lib.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aic_osm_lib.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/an/if_aironet_ieee.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/an/if_an_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/an/if_anreg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-isa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ath/if_athioctl.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_audio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_card.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_core.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_i2c.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_os.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_os.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_reg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/bktr_tuner.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/ioctl_bt848.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/ioctl_meteor.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ciss/cissreg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/cronyxfw.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/csigma.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/csigmafw.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/cxddk.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/cxddk.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/cxreg.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/if_cx.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/machdep.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/cx/ng_cx.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/dgb/dgb.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/dgb/dgbios.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/dgb/dgfep.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/dgb/dgreg.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/drmP.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/drm_bufs.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/drm_dma.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/drm_drv.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/drm_sysctl.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/mga_dma.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/mga_drv.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/r128.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/r128_cce.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/r128_drv.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/radeon.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/radeon_cp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/drm/radeon_drv.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/en/midway.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/fb/creator.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/fe/if_fe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/firewirereg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/fwmem.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/fwohci_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/fwohcireg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/fwohcivar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/sbp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/sbp.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/firewire/sbp_targ.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/gfb/gfb_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/hatm/if_hatm_intr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_buffer.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_globals.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_if.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_init.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_intr.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_receive.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_stats.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_suni.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_transmit.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_var.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/eni_vcm.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/hea_freebsd.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/hea_freebsd.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hea/hea_pci.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ic/i8259.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/ida/ida.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ida/ida_eisa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ida/ida_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ida/idareg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ida/idavar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/idt/idt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/idt/idt_harp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/if_ndis/if_ndis.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/if_ndis/if_ndisvar.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/dev/iicbus/if_ic.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ips/ips_commands.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/led/led.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/lmc/if_lmc.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/lmc/if_lmc_common.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/lmc/if_lmc_fbsd3.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/lmc/if_lmc_media.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/lmc/if_lmcioctl.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/lmc/if_lmcvar.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/dev/lnc/if_lnc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/md/md.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/my/if_my.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/owi/if_owi.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pccard/pccarddevs.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pccbb/pccbbdevid.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ppbus/if_plip.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/ray/if_ray.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sio/sio_ebus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sio/sio_isa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sn/if_sn.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sound/pcm/sndstat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/stg/tmc18c30.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/twe/twe_compat.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/twe/twe_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/twe/twe_tables.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/twe/tweio.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/twe/twereg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/tx/if_tx.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/if_aue.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/if_axe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/if_cue.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/if_rue.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ohci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ohcivar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ubsa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ucom.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ufm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/uhci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/ukbd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/usbdevs.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/usbdevs_data.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/uvisor.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/usb/uvscom.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/vinum/vinum.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/vinum/vinumconfig.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/vinum/vinumrevive.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/wi/if_wireg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/dev/xe/if_xe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/bootsect.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/bpb.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/fat.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/ntfs/ntfs_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs.c#4 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_ctl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_ioctl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_map.c#4 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_rlimit.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/procfs/procfs_type.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/pseudofs/pseudofs.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/smbfs/smbfs_node.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/smbfs/smbfs_smb.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/udf/udf_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/geom/geom.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/geom/geom_dump.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/geom/geom_event.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/geom/geom_io.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/geom/geom_pc98.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/gnu/dev/sound/pci/emu10k1.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/acpica/acpi_toshiba.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/i386/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/elan-mmcr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/mptable.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_proto.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/syscalls.isc#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/syscalls.isc.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/syscalls.master#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/syscalls.xenix#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/apicreg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/cpu.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/cronyx.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/i386/include/cserial.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/i386/include/elan_mmcr.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/i386/include/ioctl_bt848.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/ioctl_meteor.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/kse.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/pcvt_ioctl.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/profile.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/sf_buf.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/include/sysarch.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/atpic.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/cronyx.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/cx.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/cxreg.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/cy.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/icu.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/if_cx.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/loran.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/linux/syscalls.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/i386/svr4/svr4_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/acpica/madt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/Makefile#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_misc.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_proto.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_signal.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_sigtramp.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_syscall.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_sysent.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_sysvec.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/ia32_util.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/syscalls.conf#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia32/syscalls.master#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia64/dump_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/include/ioctl_bt848.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/include/ioctl_meteor.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/include/kse.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/ia64/include/runq.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/include/sysarch.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ia64/include/ucontext.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/isa/psm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#5 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_event.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/subr_mbpool.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/subr_mbuf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/subr_power.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#5 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#5 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/tty.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/libkern/ffs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/libkern/ffsl.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/libkern/fls.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/libkern/flsl.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/libkern/iconv_xlat16.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/acpi/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/acpi/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/acpi/acpi/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/acpi/acpi_toshiba/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/cam/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/crypto/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/cx/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/drm/mga/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/drm/r128/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/drm/radeon/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/drm/sis/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/drm/tdfx/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/hea/Makefile#2 delete
.. //depot/projects/trustedbsd/audit2/sys/modules/ida/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/if_ndis/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/ndis/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/hci/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/l2cap/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/netgraph/fec/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/raidframe/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/sio/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sys/modules/sound/driver/emu10k1/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/ubsa/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/ucom/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/udf/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/ufm/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/uftdi/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/ukbd/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/umct/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/uplcom/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/uvisor/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/modules/uvscom/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/bpf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/bpf.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/bridge.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_disc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_ef.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_faith.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_gif.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_gre.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_gre.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_loop.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_stf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_tun.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_var.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_vlan.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/if_vlan_var.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net/route.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/net80211/ieee80211_radiotap.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/atm/ng_atm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/atm/ngatmbase.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/atm/uni/ng_uni.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_eiface.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_eiface.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_etf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_ether.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_ether.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_parse.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_parse.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/in.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/tcp.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/tcp_hostcache.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/in6.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/ip6_fw.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/ipsec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netkey/key.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_conn.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_crypt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_rq.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_rq.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_smb.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/netsmb/smb_subr.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/nfs4client/nfs4_idmap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/opencrypto/crmbuf.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/opencrypto/cryptodev.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pc98/i386/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pc98/pc98/sio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pc98/pc98/sio_cbus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/cy_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_dc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_dcreg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_pcn.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_rl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_sf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_sis.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_sisreg.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_sk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_ste.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_tl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_vr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_wb.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/if_xl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/pci/meteor.c#2 delete
.. //depot/projects/trustedbsd/audit2/sys/pci/meteor_reg.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/pci/ncr.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/include/kse.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/powerpc/include/nexusvar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/include/powerpc.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powermac/ata_macio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powermac/openpic_macio.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/elf_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/nexus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/ofw_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/pmap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/psim/ata_iobus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/powerpc/psim/openpic_iobus.c#1 branch
.. //depot/projects/trustedbsd/audit2/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac/mac_net.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac_partition/mac_partition.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/security/mac_test/mac_test.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/include/kse.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/sparc64/include/ofw_machdep.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/dump_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/mp_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/ofw_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/_null.h#1 branch
.. //depot/projects/trustedbsd/audit2/sys/sys/copyright.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/filedesc.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/iconv.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/imgact_elf.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/ioctl_bt848.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/sys/ioctl_meteor.h#2 delete
.. //depot/projects/trustedbsd/audit2/sys/sys/kse.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/libkern.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/mac.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/mac_policy.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/mbuf.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/param.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/proc.h#4 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/sf_buf.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/socket.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/stddef.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#5 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#5 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#5 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/systm.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/uio.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/umtx.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/sys/vnode.h#4 integrate
.. //depot/projects/trustedbsd/audit2/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/device_pager.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/phys_pager.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/uma_core.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/uma_int.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_contig.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_map.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_object.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vm_page.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sys/vm/vnode_pager.c#2 integrate

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/alpha/alpha/db_instruction.h#2 (text+ko) ====

@@ -1,4 +1,3 @@
-/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */
 /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */
 
 /* 
@@ -25,6 +24,8 @@
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
+ *
+ * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.6 2004/01/04 23:30:47 obrien Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/audit2/sys/alpha/alpha/db_trace.c#2 (text+ko) ====

@@ -1,4 +1,3 @@
-/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */
 /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */
 
 /*-
@@ -42,8 +41,8 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-
 /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.18 2004/01/04 23:30:47 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,7 +98,7 @@
 	{ (uintptr_t)&XentSys,		"syscall" },
 	{ (uintptr_t)&XentUna,		"unaligned access fault" },
 	{ (uintptr_t)&XentRestart,	"console restart" },
-	{ NULL }
+	{ 0, NULL }
 };
 
 
@@ -180,7 +179,7 @@
 {
 	int i;
 
-	for (i = 0; special_symbols[i].ss_val != NULL; ++i)
+	for (i = 0; special_symbols[i].ss_val != 0; ++i)
 		if (v == special_symbols[i].ss_val)
 			return 1;
 	return 0;
@@ -339,7 +338,7 @@
 		if (sym_is_trapsymbol(symval)) {
 			tf = (struct trapframe *)frame;
 
-			for (i = 0; special_symbols[i].ss_val != NULL; ++i)
+			for (i = 0; special_symbols[i].ss_val != 0; ++i)
 				if (symval == special_symbols[i].ss_val)
 					db_printf("--- %s",
 					    special_symbols[i].ss_note);

==== //depot/projects/trustedbsd/audit2/sys/alpha/alpha/dump_machdep.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.5 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.6 2003/12/23 02:36:41 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,7 +88,7 @@
 
 	dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE;
 	dumplo -= sizeof kdh * 2;
-	i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh);
+	i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh);
 	if (i)
 		printf("\nDump failed writing header (%d)\n", i);
 	dumplo += sizeof kdh;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Jan 14 19:29:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1039D16A4D0; Wed, 14 Jan 2004 19:29:05 -0800 (PST)
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 AEE2416A4CE
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 19:29:04 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 697F443D79
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 19:28:37 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0F3Sb0B006058
	for <perforce@freebsd.org>; Wed, 14 Jan 2004 19:28:37 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0F3SZON006055
	for perforce@freebsd.org; Wed, 14 Jan 2004 19:28:35 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Wed, 14 Jan 2004 19:28:35 -0800 (PST)
Message-Id: <200401150328.i0F3SZON006055@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45369 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: Thu, 15 Jan 2004 03:29:05 -0000

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

Change 45369 by marcel@marcel_nfs on 2004/01/14 19:25:34

	IFC @45364
	
	The gdb branch is here to help out with gdb imports and other
	gdb related work. This branch is open for everyone.

Affected files ...

.. //depot/projects/gdb/COPYRIGHT#1 branch
.. //depot/projects/gdb/MAINTAINERS#1 branch
.. //depot/projects/gdb/Makefile#1 branch
.. //depot/projects/gdb/Makefile.inc1#1 branch
.. //depot/projects/gdb/README#1 branch
.. //depot/projects/gdb/UPDATING#1 branch
.. //depot/projects/gdb/bin/Makefile#1 branch
.. //depot/projects/gdb/bin/Makefile.inc#1 branch
.. //depot/projects/gdb/bin/cat/Makefile#1 branch
.. //depot/projects/gdb/bin/cat/cat.1#1 branch
.. //depot/projects/gdb/bin/cat/cat.c#1 branch
.. //depot/projects/gdb/bin/chflags/Makefile#1 branch
.. //depot/projects/gdb/bin/chflags/chflags.1#1 branch
.. //depot/projects/gdb/bin/chflags/chflags.c#1 branch
.. //depot/projects/gdb/bin/chio/Makefile#1 branch
.. //depot/projects/gdb/bin/chio/chio.1#1 branch
.. //depot/projects/gdb/bin/chio/chio.c#1 branch
.. //depot/projects/gdb/bin/chio/defs.h#1 branch
.. //depot/projects/gdb/bin/chio/pathnames.h#1 branch
.. //depot/projects/gdb/bin/chmod/Makefile#1 branch
.. //depot/projects/gdb/bin/chmod/chmod.1#1 branch
.. //depot/projects/gdb/bin/chmod/chmod.c#1 branch
.. //depot/projects/gdb/bin/cp/Makefile#1 branch
.. //depot/projects/gdb/bin/cp/cp.1#1 branch
.. //depot/projects/gdb/bin/cp/cp.c#1 branch
.. //depot/projects/gdb/bin/cp/extern.h#1 branch
.. //depot/projects/gdb/bin/cp/utils.c#1 branch
.. //depot/projects/gdb/bin/csh/Makefile#1 branch
.. //depot/projects/gdb/bin/csh/USD.doc/csh.1#1 branch
.. //depot/projects/gdb/bin/csh/USD.doc/csh.2#1 branch
.. //depot/projects/gdb/bin/csh/USD.doc/csh.3#1 branch
.. //depot/projects/gdb/bin/csh/USD.doc/csh.4#1 branch
.. //depot/projects/gdb/bin/csh/USD.doc/csh.a#1 branch
.. //depot/projects/gdb/bin/csh/USD.doc/csh.g#1 branch
.. //depot/projects/gdb/bin/csh/USD.doc/tabs#1 branch
.. //depot/projects/gdb/bin/csh/config.h#1 branch
.. //depot/projects/gdb/bin/csh/host.defs#1 branch
.. //depot/projects/gdb/bin/date/Makefile#1 branch
.. //depot/projects/gdb/bin/date/date.1#1 branch
.. //depot/projects/gdb/bin/date/date.c#1 branch
.. //depot/projects/gdb/bin/date/extern.h#1 branch
.. //depot/projects/gdb/bin/date/netdate.c#1 branch
.. //depot/projects/gdb/bin/date/vary.c#1 branch
.. //depot/projects/gdb/bin/date/vary.h#1 branch
.. //depot/projects/gdb/bin/dd/Makefile#1 branch
.. //depot/projects/gdb/bin/dd/args.c#1 branch
.. //depot/projects/gdb/bin/dd/conv.c#1 branch
.. //depot/projects/gdb/bin/dd/conv_tab.c#1 branch
.. //depot/projects/gdb/bin/dd/dd.1#1 branch
.. //depot/projects/gdb/bin/dd/dd.c#1 branch
.. //depot/projects/gdb/bin/dd/dd.h#1 branch
.. //depot/projects/gdb/bin/dd/extern.h#1 branch
.. //depot/projects/gdb/bin/dd/misc.c#1 branch
.. //depot/projects/gdb/bin/dd/position.c#1 branch
.. //depot/projects/gdb/bin/df/Makefile#1 branch
.. //depot/projects/gdb/bin/df/df.1#1 branch
.. //depot/projects/gdb/bin/df/df.c#1 branch
.. //depot/projects/gdb/bin/domainname/Makefile#1 branch
.. //depot/projects/gdb/bin/domainname/domainname.1#1 branch
.. //depot/projects/gdb/bin/domainname/domainname.c#1 branch
.. //depot/projects/gdb/bin/echo/Makefile#1 branch
.. //depot/projects/gdb/bin/echo/echo.1#1 branch
.. //depot/projects/gdb/bin/echo/echo.c#1 branch
.. //depot/projects/gdb/bin/ed/Makefile#1 branch
.. //depot/projects/gdb/bin/ed/POSIX#1 branch
.. //depot/projects/gdb/bin/ed/README#1 branch
.. //depot/projects/gdb/bin/ed/buf.c#1 branch
.. //depot/projects/gdb/bin/ed/cbc.c#1 branch
.. //depot/projects/gdb/bin/ed/ed.1#1 branch
.. //depot/projects/gdb/bin/ed/ed.h#1 branch
.. //depot/projects/gdb/bin/ed/glbl.c#1 branch
.. //depot/projects/gdb/bin/ed/io.c#1 branch
.. //depot/projects/gdb/bin/ed/main.c#1 branch
.. //depot/projects/gdb/bin/ed/re.c#1 branch
.. //depot/projects/gdb/bin/ed/sub.c#1 branch
.. //depot/projects/gdb/bin/ed/test/=.err#1 branch
.. //depot/projects/gdb/bin/ed/test/Makefile#1 branch
.. //depot/projects/gdb/bin/ed/test/README#1 branch
.. //depot/projects/gdb/bin/ed/test/TODO#1 branch
.. //depot/projects/gdb/bin/ed/test/a.d#1 branch
.. //depot/projects/gdb/bin/ed/test/a.r#1 branch
.. //depot/projects/gdb/bin/ed/test/a.t#1 branch
.. //depot/projects/gdb/bin/ed/test/a1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/a2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/addr.d#1 branch
.. //depot/projects/gdb/bin/ed/test/addr.r#1 branch
.. //depot/projects/gdb/bin/ed/test/addr.t#1 branch
.. //depot/projects/gdb/bin/ed/test/addr1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/addr2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/ascii.d.uu#1 branch
.. //depot/projects/gdb/bin/ed/test/ascii.r.uu#1 branch
.. //depot/projects/gdb/bin/ed/test/ascii.t#1 branch
.. //depot/projects/gdb/bin/ed/test/bang1.d#1 branch
.. //depot/projects/gdb/bin/ed/test/bang1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/bang1.r#1 branch
.. //depot/projects/gdb/bin/ed/test/bang1.t#1 branch
.. //depot/projects/gdb/bin/ed/test/bang2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/c.d#1 branch
.. //depot/projects/gdb/bin/ed/test/c.r#1 branch
.. //depot/projects/gdb/bin/ed/test/c.t#1 branch
.. //depot/projects/gdb/bin/ed/test/c1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/c2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/ckscripts.sh#1 branch
.. //depot/projects/gdb/bin/ed/test/d.d#1 branch
.. //depot/projects/gdb/bin/ed/test/d.err#1 branch
.. //depot/projects/gdb/bin/ed/test/d.r#1 branch
.. //depot/projects/gdb/bin/ed/test/d.t#1 branch
.. //depot/projects/gdb/bin/ed/test/e1.d#1 branch
.. //depot/projects/gdb/bin/ed/test/e1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/e1.r#1 branch
.. //depot/projects/gdb/bin/ed/test/e1.t#1 branch
.. //depot/projects/gdb/bin/ed/test/e2.d#1 branch
.. //depot/projects/gdb/bin/ed/test/e2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/e2.r#1 branch
.. //depot/projects/gdb/bin/ed/test/e2.t#1 branch
.. //depot/projects/gdb/bin/ed/test/e3.d#1 branch
.. //depot/projects/gdb/bin/ed/test/e3.err#1 branch
.. //depot/projects/gdb/bin/ed/test/e3.r#1 branch
.. //depot/projects/gdb/bin/ed/test/e3.t#1 branch
.. //depot/projects/gdb/bin/ed/test/e4.d#1 branch
.. //depot/projects/gdb/bin/ed/test/e4.r#1 branch
.. //depot/projects/gdb/bin/ed/test/e4.t#1 branch
.. //depot/projects/gdb/bin/ed/test/f1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/f2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/g1.d#1 branch
.. //depot/projects/gdb/bin/ed/test/g1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/g1.r#1 branch
.. //depot/projects/gdb/bin/ed/test/g1.t#1 branch
.. //depot/projects/gdb/bin/ed/test/g2.d#1 branch
.. //depot/projects/gdb/bin/ed/test/g2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/g2.r#1 branch
.. //depot/projects/gdb/bin/ed/test/g2.t#1 branch
.. //depot/projects/gdb/bin/ed/test/g3.d#1 branch
.. //depot/projects/gdb/bin/ed/test/g3.err#1 branch
.. //depot/projects/gdb/bin/ed/test/g3.r#1 branch
.. //depot/projects/gdb/bin/ed/test/g3.t#1 branch
.. //depot/projects/gdb/bin/ed/test/g4.d#1 branch
.. //depot/projects/gdb/bin/ed/test/g4.r#1 branch
.. //depot/projects/gdb/bin/ed/test/g4.t#1 branch
.. //depot/projects/gdb/bin/ed/test/g5.d#1 branch
.. //depot/projects/gdb/bin/ed/test/g5.r#1 branch
.. //depot/projects/gdb/bin/ed/test/g5.t#1 branch
.. //depot/projects/gdb/bin/ed/test/h.err#1 branch
.. //depot/projects/gdb/bin/ed/test/i.d#1 branch
.. //depot/projects/gdb/bin/ed/test/i.r#1 branch
.. //depot/projects/gdb/bin/ed/test/i.t#1 branch
.. //depot/projects/gdb/bin/ed/test/i1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/i2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/i3.err#1 branch
.. //depot/projects/gdb/bin/ed/test/j.d#1 branch
.. //depot/projects/gdb/bin/ed/test/j.r#1 branch
.. //depot/projects/gdb/bin/ed/test/j.t#1 branch
.. //depot/projects/gdb/bin/ed/test/k.d#1 branch
.. //depot/projects/gdb/bin/ed/test/k.r#1 branch
.. //depot/projects/gdb/bin/ed/test/k.t#1 branch
.. //depot/projects/gdb/bin/ed/test/k1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/k2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/k3.err#1 branch
.. //depot/projects/gdb/bin/ed/test/k4.err#1 branch
.. //depot/projects/gdb/bin/ed/test/l.d#1 branch
.. //depot/projects/gdb/bin/ed/test/l.r#1 branch
.. //depot/projects/gdb/bin/ed/test/l.t#1 branch
.. //depot/projects/gdb/bin/ed/test/m.d#1 branch
.. //depot/projects/gdb/bin/ed/test/m.err#1 branch
.. //depot/projects/gdb/bin/ed/test/m.r#1 branch
.. //depot/projects/gdb/bin/ed/test/m.t#1 branch
.. //depot/projects/gdb/bin/ed/test/mkscripts.sh#1 branch
.. //depot/projects/gdb/bin/ed/test/n.d#1 branch
.. //depot/projects/gdb/bin/ed/test/n.r#1 branch
.. //depot/projects/gdb/bin/ed/test/n.t#1 branch
.. //depot/projects/gdb/bin/ed/test/nl.err#1 branch
.. //depot/projects/gdb/bin/ed/test/nl1.d#1 branch
.. //depot/projects/gdb/bin/ed/test/nl1.r#1 branch
.. //depot/projects/gdb/bin/ed/test/nl1.t#1 branch
.. //depot/projects/gdb/bin/ed/test/nl2.d#1 branch
.. //depot/projects/gdb/bin/ed/test/nl2.r#1 branch
.. //depot/projects/gdb/bin/ed/test/nl2.t#1 branch
.. //depot/projects/gdb/bin/ed/test/p.d#1 branch
.. //depot/projects/gdb/bin/ed/test/p.r#1 branch
.. //depot/projects/gdb/bin/ed/test/p.t#1 branch
.. //depot/projects/gdb/bin/ed/test/q.d#1 branch
.. //depot/projects/gdb/bin/ed/test/q.r#1 branch
.. //depot/projects/gdb/bin/ed/test/q.t#1 branch
.. //depot/projects/gdb/bin/ed/test/q1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/r1.d#1 branch
.. //depot/projects/gdb/bin/ed/test/r1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/r1.r#1 branch
.. //depot/projects/gdb/bin/ed/test/r1.t#1 branch
.. //depot/projects/gdb/bin/ed/test/r2.d#1 branch
.. //depot/projects/gdb/bin/ed/test/r2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/r2.r#1 branch
.. //depot/projects/gdb/bin/ed/test/r2.t#1 branch
.. //depot/projects/gdb/bin/ed/test/r3.d#1 branch
.. //depot/projects/gdb/bin/ed/test/r3.r#1 branch
.. //depot/projects/gdb/bin/ed/test/r3.t#1 branch
.. //depot/projects/gdb/bin/ed/test/s1.d#1 branch
.. //depot/projects/gdb/bin/ed/test/s1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s1.r#1 branch
.. //depot/projects/gdb/bin/ed/test/s1.t#1 branch
.. //depot/projects/gdb/bin/ed/test/s10.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s2.d#1 branch
.. //depot/projects/gdb/bin/ed/test/s2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s2.r#1 branch
.. //depot/projects/gdb/bin/ed/test/s2.t#1 branch
.. //depot/projects/gdb/bin/ed/test/s3.d#1 branch
.. //depot/projects/gdb/bin/ed/test/s3.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s3.r#1 branch
.. //depot/projects/gdb/bin/ed/test/s3.t#1 branch
.. //depot/projects/gdb/bin/ed/test/s4.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s5.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s6.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s7.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s8.err#1 branch
.. //depot/projects/gdb/bin/ed/test/s9.err#1 branch
.. //depot/projects/gdb/bin/ed/test/t.d#1 branch
.. //depot/projects/gdb/bin/ed/test/t.r#1 branch
.. //depot/projects/gdb/bin/ed/test/t1.d#1 branch
.. //depot/projects/gdb/bin/ed/test/t1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/t1.r#1 branch
.. //depot/projects/gdb/bin/ed/test/t1.t#1 branch
.. //depot/projects/gdb/bin/ed/test/t2.d#1 branch
.. //depot/projects/gdb/bin/ed/test/t2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/t2.r#1 branch
.. //depot/projects/gdb/bin/ed/test/t2.t#1 branch
.. //depot/projects/gdb/bin/ed/test/u.d#1 branch
.. //depot/projects/gdb/bin/ed/test/u.err#1 branch
.. //depot/projects/gdb/bin/ed/test/u.r#1 branch
.. //depot/projects/gdb/bin/ed/test/u.t#1 branch
.. //depot/projects/gdb/bin/ed/test/v.d#1 branch
.. //depot/projects/gdb/bin/ed/test/v.r#1 branch
.. //depot/projects/gdb/bin/ed/test/v.t#1 branch
.. //depot/projects/gdb/bin/ed/test/w.d#1 branch
.. //depot/projects/gdb/bin/ed/test/w.r#1 branch
.. //depot/projects/gdb/bin/ed/test/w.t#1 branch
.. //depot/projects/gdb/bin/ed/test/w1.err#1 branch
.. //depot/projects/gdb/bin/ed/test/w2.err#1 branch
.. //depot/projects/gdb/bin/ed/test/w3.err#1 branch
.. //depot/projects/gdb/bin/ed/test/x.err#1 branch
.. //depot/projects/gdb/bin/ed/test/z.err#1 branch
.. //depot/projects/gdb/bin/ed/undo.c#1 branch
.. //depot/projects/gdb/bin/expr/Makefile#1 branch
.. //depot/projects/gdb/bin/expr/expr.1#1 branch
.. //depot/projects/gdb/bin/expr/expr.y#1 branch
.. //depot/projects/gdb/bin/getfacl/Makefile#1 branch
.. //depot/projects/gdb/bin/getfacl/getfacl.1#1 branch
.. //depot/projects/gdb/bin/getfacl/getfacl.c#1 branch
.. //depot/projects/gdb/bin/hostname/Makefile#1 branch
.. //depot/projects/gdb/bin/hostname/hostname.1#1 branch
.. //depot/projects/gdb/bin/hostname/hostname.c#1 branch
.. //depot/projects/gdb/bin/kenv/Makefile#1 branch
.. //depot/projects/gdb/bin/kenv/kenv.1#1 branch
.. //depot/projects/gdb/bin/kenv/kenv.c#1 branch
.. //depot/projects/gdb/bin/kill/Makefile#1 branch
.. //depot/projects/gdb/bin/kill/kill.1#1 branch
.. //depot/projects/gdb/bin/kill/kill.c#1 branch
.. //depot/projects/gdb/bin/ln/Makefile#1 branch
.. //depot/projects/gdb/bin/ln/ln.1#1 branch
.. //depot/projects/gdb/bin/ln/ln.c#1 branch
.. //depot/projects/gdb/bin/ln/symlink.7#1 branch
.. //depot/projects/gdb/bin/ls/Makefile#1 branch
.. //depot/projects/gdb/bin/ls/cmp.c#1 branch
.. //depot/projects/gdb/bin/ls/extern.h#1 branch
.. //depot/projects/gdb/bin/ls/ls.1#1 branch
.. //depot/projects/gdb/bin/ls/ls.c#1 branch
.. //depot/projects/gdb/bin/ls/ls.h#1 branch
.. //depot/projects/gdb/bin/ls/print.c#1 branch
.. //depot/projects/gdb/bin/ls/util.c#1 branch
.. //depot/projects/gdb/bin/mkdir/Makefile#1 branch
.. //depot/projects/gdb/bin/mkdir/mkdir.1#1 branch
.. //depot/projects/gdb/bin/mkdir/mkdir.c#1 branch
.. //depot/projects/gdb/bin/mv/Makefile#1 branch
.. //depot/projects/gdb/bin/mv/mv.1#1 branch
.. //depot/projects/gdb/bin/mv/mv.c#1 branch
.. //depot/projects/gdb/bin/pax/Makefile#1 branch
.. //depot/projects/gdb/bin/pax/ar_io.c#1 branch
.. //depot/projects/gdb/bin/pax/ar_subs.c#1 branch
.. //depot/projects/gdb/bin/pax/buf_subs.c#1 branch
.. //depot/projects/gdb/bin/pax/cache.c#1 branch
.. //depot/projects/gdb/bin/pax/cache.h#1 branch
.. //depot/projects/gdb/bin/pax/cpio.1#1 branch
.. //depot/projects/gdb/bin/pax/cpio.c#1 branch
.. //depot/projects/gdb/bin/pax/cpio.h#1 branch
.. //depot/projects/gdb/bin/pax/extern.h#1 branch
.. //depot/projects/gdb/bin/pax/file_subs.c#1 branch
.. //depot/projects/gdb/bin/pax/ftree.c#1 branch
.. //depot/projects/gdb/bin/pax/ftree.h#1 branch
.. //depot/projects/gdb/bin/pax/gen_subs.c#1 branch
.. //depot/projects/gdb/bin/pax/getoldopt.c#1 branch
.. //depot/projects/gdb/bin/pax/options.c#1 branch
.. //depot/projects/gdb/bin/pax/options.h#1 branch
.. //depot/projects/gdb/bin/pax/pat_rep.c#1 branch
.. //depot/projects/gdb/bin/pax/pat_rep.h#1 branch
.. //depot/projects/gdb/bin/pax/pax.1#1 branch
.. //depot/projects/gdb/bin/pax/pax.c#1 branch
.. //depot/projects/gdb/bin/pax/pax.h#1 branch
.. //depot/projects/gdb/bin/pax/sel_subs.c#1 branch
.. //depot/projects/gdb/bin/pax/sel_subs.h#1 branch
.. //depot/projects/gdb/bin/pax/tables.c#1 branch
.. //depot/projects/gdb/bin/pax/tables.h#1 branch
.. //depot/projects/gdb/bin/pax/tar.1#1 branch
.. //depot/projects/gdb/bin/pax/tar.c#1 branch
.. //depot/projects/gdb/bin/pax/tar.h#1 branch
.. //depot/projects/gdb/bin/pax/tty_subs.c#1 branch
.. //depot/projects/gdb/bin/ps/Makefile#1 branch
.. //depot/projects/gdb/bin/ps/extern.h#1 branch
.. //depot/projects/gdb/bin/ps/fmt.c#1 branch
.. //depot/projects/gdb/bin/ps/keyword.c#1 branch
.. //depot/projects/gdb/bin/ps/nlist.c#1 branch
.. //depot/projects/gdb/bin/ps/print.c#1 branch
.. //depot/projects/gdb/bin/ps/ps.1#1 branch
.. //depot/projects/gdb/bin/ps/ps.c#1 branch
.. //depot/projects/gdb/bin/ps/ps.h#1 branch
.. //depot/projects/gdb/bin/pwd/Makefile#1 branch
.. //depot/projects/gdb/bin/pwd/pwd.1#1 branch
.. //depot/projects/gdb/bin/pwd/pwd.c#1 branch
.. //depot/projects/gdb/bin/rcp/Makefile#1 branch
.. //depot/projects/gdb/bin/rcp/extern.h#1 branch
.. //depot/projects/gdb/bin/rcp/rcp.1#1 branch
.. //depot/projects/gdb/bin/rcp/rcp.c#1 branch
.. //depot/projects/gdb/bin/rcp/util.c#1 branch
.. //depot/projects/gdb/bin/realpath/Makefile#1 branch
.. //depot/projects/gdb/bin/realpath/realpath.1#1 branch
.. //depot/projects/gdb/bin/realpath/realpath.c#1 branch
.. //depot/projects/gdb/bin/rm/Makefile#1 branch
.. //depot/projects/gdb/bin/rm/rm.1#1 branch
.. //depot/projects/gdb/bin/rm/rm.c#1 branch
.. //depot/projects/gdb/bin/rmail/Makefile#1 branch
.. //depot/projects/gdb/bin/rmdir/Makefile#1 branch
.. //depot/projects/gdb/bin/rmdir/rmdir.1#1 branch
.. //depot/projects/gdb/bin/rmdir/rmdir.c#1 branch
.. //depot/projects/gdb/bin/setfacl/Makefile#1 branch
.. //depot/projects/gdb/bin/setfacl/file.c#1 branch
.. //depot/projects/gdb/bin/setfacl/mask.c#1 branch
.. //depot/projects/gdb/bin/setfacl/merge.c#1 branch
.. //depot/projects/gdb/bin/setfacl/remove.c#1 branch
.. //depot/projects/gdb/bin/setfacl/setfacl.1#1 branch
.. //depot/projects/gdb/bin/setfacl/setfacl.c#1 branch
.. //depot/projects/gdb/bin/setfacl/setfacl.h#1 branch
.. //depot/projects/gdb/bin/setfacl/util.c#1 branch
.. //depot/projects/gdb/bin/sh/Makefile#1 branch
.. //depot/projects/gdb/bin/sh/TOUR#1 branch
.. //depot/projects/gdb/bin/sh/alias.c#1 branch
.. //depot/projects/gdb/bin/sh/alias.h#1 branch
.. //depot/projects/gdb/bin/sh/arith.h#1 branch
.. //depot/projects/gdb/bin/sh/arith.y#1 branch
.. //depot/projects/gdb/bin/sh/arith_lex.l#1 branch
.. //depot/projects/gdb/bin/sh/bltin/bltin.h#1 branch
.. //depot/projects/gdb/bin/sh/bltin/echo.1#1 branch
.. //depot/projects/gdb/bin/sh/bltin/echo.c#1 branch
.. //depot/projects/gdb/bin/sh/builtins.def#1 branch
.. //depot/projects/gdb/bin/sh/cd.c#1 branch
.. //depot/projects/gdb/bin/sh/cd.h#1 branch
.. //depot/projects/gdb/bin/sh/error.c#1 branch
.. //depot/projects/gdb/bin/sh/error.h#1 branch
.. //depot/projects/gdb/bin/sh/eval.c#1 branch
.. //depot/projects/gdb/bin/sh/eval.h#1 branch
.. //depot/projects/gdb/bin/sh/exec.c#1 branch
.. //depot/projects/gdb/bin/sh/exec.h#1 branch
.. //depot/projects/gdb/bin/sh/expand.c#1 branch
.. //depot/projects/gdb/bin/sh/expand.h#1 branch
.. //depot/projects/gdb/bin/sh/funcs/cmv#1 branch
.. //depot/projects/gdb/bin/sh/funcs/dirs#1 branch
.. //depot/projects/gdb/bin/sh/funcs/kill#1 branch
.. //depot/projects/gdb/bin/sh/funcs/login#1 branch
.. //depot/projects/gdb/bin/sh/funcs/newgrp#1 branch
.. //depot/projects/gdb/bin/sh/funcs/popd#1 branch
.. //depot/projects/gdb/bin/sh/funcs/pushd#1 branch
.. //depot/projects/gdb/bin/sh/funcs/suspend#1 branch
.. //depot/projects/gdb/bin/sh/histedit.c#1 branch
.. //depot/projects/gdb/bin/sh/init.h#1 branch
.. //depot/projects/gdb/bin/sh/input.c#1 branch
.. //depot/projects/gdb/bin/sh/input.h#1 branch
.. //depot/projects/gdb/bin/sh/jobs.c#1 branch
.. //depot/projects/gdb/bin/sh/jobs.h#1 branch
.. //depot/projects/gdb/bin/sh/mail.c#1 branch
.. //depot/projects/gdb/bin/sh/mail.h#1 branch
.. //depot/projects/gdb/bin/sh/main.c#1 branch
.. //depot/projects/gdb/bin/sh/main.h#1 branch
.. //depot/projects/gdb/bin/sh/memalloc.c#1 branch
.. //depot/projects/gdb/bin/sh/memalloc.h#1 branch
.. //depot/projects/gdb/bin/sh/miscbltin.c#1 branch
.. //depot/projects/gdb/bin/sh/mkbuiltins#1 branch
.. //depot/projects/gdb/bin/sh/mkinit.c#1 branch
.. //depot/projects/gdb/bin/sh/mknodes.c#1 branch
.. //depot/projects/gdb/bin/sh/mksyntax.c#1 branch
.. //depot/projects/gdb/bin/sh/mktokens#1 branch
.. //depot/projects/gdb/bin/sh/myhistedit.h#1 branch
.. //depot/projects/gdb/bin/sh/mystring.c#1 branch
.. //depot/projects/gdb/bin/sh/mystring.h#1 branch
.. //depot/projects/gdb/bin/sh/nodes.c.pat#1 branch
.. //depot/projects/gdb/bin/sh/nodetypes#1 branch
.. //depot/projects/gdb/bin/sh/options.c#1 branch
.. //depot/projects/gdb/bin/sh/options.h#1 branch
.. //depot/projects/gdb/bin/sh/output.c#1 branch
.. //depot/projects/gdb/bin/sh/output.h#1 branch
.. //depot/projects/gdb/bin/sh/parser.c#1 branch
.. //depot/projects/gdb/bin/sh/parser.h#1 branch
.. //depot/projects/gdb/bin/sh/redir.c#1 branch
.. //depot/projects/gdb/bin/sh/redir.h#1 branch
.. //depot/projects/gdb/bin/sh/sh.1#1 branch
.. //depot/projects/gdb/bin/sh/shell.h#1 branch
.. //depot/projects/gdb/bin/sh/show.c#1 branch
.. //depot/projects/gdb/bin/sh/show.h#1 branch
.. //depot/projects/gdb/bin/sh/trap.c#1 branch
.. //depot/projects/gdb/bin/sh/trap.h#1 branch
.. //depot/projects/gdb/bin/sh/var.c#1 branch
.. //depot/projects/gdb/bin/sh/var.h#1 branch
.. //depot/projects/gdb/bin/sleep/Makefile#1 branch
.. //depot/projects/gdb/bin/sleep/sleep.1#1 branch
.. //depot/projects/gdb/bin/sleep/sleep.c#1 branch
.. //depot/projects/gdb/bin/stty/Makefile#1 branch
.. //depot/projects/gdb/bin/stty/cchar.c#1 branch
.. //depot/projects/gdb/bin/stty/extern.h#1 branch
.. //depot/projects/gdb/bin/stty/gfmt.c#1 branch
.. //depot/projects/gdb/bin/stty/key.c#1 branch
.. //depot/projects/gdb/bin/stty/modes.c#1 branch
.. //depot/projects/gdb/bin/stty/print.c#1 branch
.. //depot/projects/gdb/bin/stty/stty.1#1 branch
.. //depot/projects/gdb/bin/stty/stty.c#1 branch
.. //depot/projects/gdb/bin/stty/stty.h#1 branch
.. //depot/projects/gdb/bin/stty/util.c#1 branch
.. //depot/projects/gdb/bin/sync/Makefile#1 branch
.. //depot/projects/gdb/bin/sync/sync.8#1 branch
.. //depot/projects/gdb/bin/sync/sync.c#1 branch
.. //depot/projects/gdb/bin/test/Makefile#1 branch
.. //depot/projects/gdb/bin/test/TEST.README#1 branch
.. //depot/projects/gdb/bin/test/TEST.csh#1 branch
.. //depot/projects/gdb/bin/test/TEST.sh#1 branch
.. //depot/projects/gdb/bin/test/test.1#1 branch
.. //depot/projects/gdb/bin/test/test.c#1 branch
.. //depot/projects/gdb/contrib/amd/AUTHORS#1 branch
.. //depot/projects/gdb/contrib/amd/BUGS#1 branch
.. //depot/projects/gdb/contrib/amd/COPYING#1 branch
.. //depot/projects/gdb/contrib/amd/ChangeLog#1 branch
.. //depot/projects/gdb/contrib/amd/FREEBSD-Xlist#1 branch
.. //depot/projects/gdb/contrib/amd/FREEBSD-upgrade#1 branch
.. //depot/projects/gdb/contrib/amd/INSTALL#1 branch
.. //depot/projects/gdb/contrib/amd/MIRRORS#1 branch
.. //depot/projects/gdb/contrib/amd/NEWS#1 branch
.. //depot/projects/gdb/contrib/amd/README#1 branch
.. //depot/projects/gdb/contrib/amd/README.ldap#1 branch
.. //depot/projects/gdb/contrib/amd/README.y2k#1 branch
.. //depot/projects/gdb/contrib/amd/amd/am_ops.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amd.8#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amd.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amd.h#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_auto.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_direct.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_error.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_host.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_inherit.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_link.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_linkx.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_nfsl.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_nfsx.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_program.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_root.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_toplvl.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amfs_union.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amq_subr.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/amq_svc.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/autil.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/clock.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/conf.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/conf_parse.y#1 branch
.. //depot/projects/gdb/contrib/amd/amd/conf_tok.l#1 branch
.. //depot/projects/gdb/contrib/amd/amd/get_args.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_file.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_hesiod.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_ldap.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_ndbm.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_nis.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_nisplus.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_passwd.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/info_union.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/map.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/mapc.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/mntfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/nfs_prot_svc.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/nfs_start.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/nfs_subr.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_TEMPLATE.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_cachefs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_cdfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_efs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_lofs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_mfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_nfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_nfs3.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_nullfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_pcfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_tfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_tmpfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_ufs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_umapfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_unionfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/ops_xfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/opts.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/restart.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/rpc_fwd.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/sched.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/srvr_amfs_auto.c#1 branch
.. //depot/projects/gdb/contrib/amd/amd/srvr_nfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/amq/amq.8#1 branch
.. //depot/projects/gdb/contrib/amd/amq/amq.c#1 branch
.. //depot/projects/gdb/contrib/amd/amq/amq.h#1 branch
.. //depot/projects/gdb/contrib/amd/amq/amq_clnt.c#1 branch
.. //depot/projects/gdb/contrib/amd/amq/amq_xdr.c#1 branch
.. //depot/projects/gdb/contrib/amd/amq/pawd.1#1 branch
.. //depot/projects/gdb/contrib/amd/amq/pawd.c#1 branch
.. //depot/projects/gdb/contrib/amd/aux_conf.h.in#1 branch
.. //depot/projects/gdb/contrib/amd/bootstrap#1 branch
.. //depot/projects/gdb/contrib/amd/commit#1 branch
.. //depot/projects/gdb/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch
.. //depot/projects/gdb/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/hn_dref/hn_dref_default.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/mount/mount_default.c#1 branch
.. //depot/projects/gdb/contrib/amd/conf/mtab/mtab_bsd.c#1 branch
.. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/transp/transp_sockets.c#1 branch
.. //depot/projects/gdb/contrib/amd/conf/trap/trap_default.h#1 branch
.. //depot/projects/gdb/contrib/amd/conf/umount/umount_bsd44.c#1 branch
.. //depot/projects/gdb/contrib/amd/config.guess#1 branch
.. //depot/projects/gdb/contrib/amd/config.guess.long#1 branch
.. //depot/projects/gdb/contrib/amd/config.sub#1 branch
.. //depot/projects/gdb/contrib/amd/configure.in#1 branch
.. //depot/projects/gdb/contrib/amd/cvs-server.txt#1 branch
.. //depot/projects/gdb/contrib/amd/depcomp#1 branch
.. //depot/projects/gdb/contrib/amd/doc/am-utils.texi#1 branch
.. //depot/projects/gdb/contrib/amd/doc/mdate-sh#1 branch
.. //depot/projects/gdb/contrib/amd/doc/texinfo.tex#1 branch
.. //depot/projects/gdb/contrib/amd/doc/version.texi#1 branch
.. //depot/projects/gdb/contrib/amd/fixmount/fixmount.8#1 branch
.. //depot/projects/gdb/contrib/amd/fixmount/fixmount.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsi_analyze.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsi_data.h#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsi_dict.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsi_gram.y#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsi_lex.l#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsi_util.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsinfo.8#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsinfo.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/fsinfo.h#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/wr_atab.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/wr_bparam.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/wr_dumpset.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/wr_exportfs.c#1 branch
.. //depot/projects/gdb/contrib/amd/fsinfo/wr_fstab.c#1 branch
.. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.8#1 branch
.. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.c#1 branch
.. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.h#1 branch
.. //depot/projects/gdb/contrib/amd/hlfsd/homedir.c#1 branch
.. //depot/projects/gdb/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch
.. //depot/projects/gdb/contrib/amd/hlfsd/stubs.c#1 branch
.. //depot/projects/gdb/contrib/amd/include/am_compat.h#1 branch
.. //depot/projects/gdb/contrib/amd/include/am_defs.h#1 branch
.. //depot/projects/gdb/contrib/amd/include/am_utils.h#1 branch
.. //depot/projects/gdb/contrib/amd/include/am_xdr_func.h#1 branch
.. //depot/projects/gdb/contrib/amd/include/amq_defs.h#1 branch
.. //depot/projects/gdb/contrib/amd/include/mount_headers1.h#1 branch
.. //depot/projects/gdb/contrib/amd/include/mount_headers2.h#1 branch
.. //depot/projects/gdb/contrib/amd/install-sh#1 branch
.. //depot/projects/gdb/contrib/amd/ldap-id.ms#1 branch
.. //depot/projects/gdb/contrib/amd/ldap-id.txt#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/alloca.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/amu.h#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/hasmntopt.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/misc_rpc.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/mount_fs.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/mtab.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/nfs_prot_xdr.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/strerror.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/util.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/wire.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/xdr_func.c#1 branch
.. //depot/projects/gdb/contrib/amd/libamu/xutil.c#1 branch
.. //depot/projects/gdb/contrib/amd/ltmain.sh#1 branch
.. //depot/projects/gdb/contrib/amd/m4/GNUmakefile#1 branch
.. //depot/projects/gdb/contrib/amd/m4/amdgrep#1 branch
.. //depot/projects/gdb/contrib/amd/m4/amindent#1 branch
.. //depot/projects/gdb/contrib/amd/m4/autopat#1 branch
.. //depot/projects/gdb/contrib/amd/m4/chop-aclocal.pl#1 branch
.. //depot/projects/gdb/contrib/amd/m4/copy-if-newbig#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/HEADER#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/TRAILER#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/c_void_p.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_amu_fs.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_extern.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_fhandle.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_field.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_fs_headers.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_lib2.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_map_funcs.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mount_style.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mount_trap.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mount_type.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_mtype_type.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_os_libs.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_umount_style.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_unmount_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/check_unmount_call.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/expand_run_string.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/extern_optarg.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/header_templates.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/host_macros.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/linux_headers.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/localconfig.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/mount_headers.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/name_package.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/name_version.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/opt_cppflags.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/opt_debug.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/opt_ldflags.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/opt_libs.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/os_cflags.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/os_cppflags.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/os_ldflags.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/package_bugreport.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/package_name.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/package_version.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/save_state.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/struct_mntent.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/struct_mnttab.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_efs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_lofs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_mfs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_rfs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_time_t.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_ufs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_xfs_args.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/macros/with_addon.m4#1 branch
.. //depot/projects/gdb/contrib/amd/m4/mk-aclocal#1 branch
.. //depot/projects/gdb/contrib/amd/m4/mkconf#1 branch
.. //depot/projects/gdb/contrib/amd/m4/rmtspc#1 branch
.. //depot/projects/gdb/contrib/amd/m4/update_build_version#1 branch
.. //depot/projects/gdb/contrib/amd/missing#1 branch
.. //depot/projects/gdb/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch
.. //depot/projects/gdb/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch
.. //depot/projects/gdb/contrib/amd/mkinstalldirs#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/Makefile.am#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/Makefile.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/am-eject.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/amd.conf-sample#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/amd.conf.5#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/amd2ldif.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/amd2sun.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/automount2amd.8#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/automount2amd.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/ctl-amd.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/ctl-hlfsd.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/expn.1#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/expn.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/fix-amd-map.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/fixrmtab.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/lostaltmail.conf-sample#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/lostaltmail.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/redhat-ctl-amd.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/wait4amd.in#1 branch
.. //depot/projects/gdb/contrib/amd/scripts/wait4amd2die.in#1 branch
.. //depot/projects/gdb/contrib/amd/tasks#1 branch
.. //depot/projects/gdb/contrib/amd/wire-test/wire-test.8#1 branch
.. //depot/projects/gdb/contrib/amd/wire-test/wire-test.c#1 branch
.. //depot/projects/gdb/contrib/bc/AUTHORS#1 branch
.. //depot/projects/gdb/contrib/bc/ChangeLog#1 branch
.. //depot/projects/gdb/contrib/bc/Examples/ckbook.b#1 branch
.. //depot/projects/gdb/contrib/bc/Examples/pi.b#1 branch
.. //depot/projects/gdb/contrib/bc/Examples/primes.b#1 branch
.. //depot/projects/gdb/contrib/bc/Examples/twins.b#1 branch
.. //depot/projects/gdb/contrib/bc/FAQ#1 branch
.. //depot/projects/gdb/contrib/bc/FREEBSD-upgrade#1 branch
.. //depot/projects/gdb/contrib/bc/INSTALL#1 branch
.. //depot/projects/gdb/contrib/bc/Makefile.am#1 branch
.. //depot/projects/gdb/contrib/bc/Makefile.in#1 branch
.. //depot/projects/gdb/contrib/bc/NEWS#1 branch
.. //depot/projects/gdb/contrib/bc/README#1 branch
.. //depot/projects/gdb/contrib/bc/Test/BUG.bc#1 branch
.. //depot/projects/gdb/contrib/bc/Test/array.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/arrayp.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/aryprm.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/atan.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/checklib.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/div.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/exp.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/fact.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/jn.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/ln.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/mul.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/raise.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/signum#1 branch
.. //depot/projects/gdb/contrib/bc/Test/sine.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/sqrt.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/sqrt1.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/sqrt2.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/testfn.b#1 branch
.. //depot/projects/gdb/contrib/bc/Test/timetest#1 branch
.. //depot/projects/gdb/contrib/bc/acconfig.h#1 branch
.. //depot/projects/gdb/contrib/bc/aclocal.m4#1 branch
.. //depot/projects/gdb/contrib/bc/bc/Makefile.am#1 branch
.. //depot/projects/gdb/contrib/bc/bc/Makefile.in#1 branch
.. //depot/projects/gdb/contrib/bc/bc/bc.y#1 branch
.. //depot/projects/gdb/contrib/bc/bc/bcdefs.h#1 branch
.. //depot/projects/gdb/contrib/bc/bc/const.h#1 branch
.. //depot/projects/gdb/contrib/bc/bc/execute.c#1 branch
.. //depot/projects/gdb/contrib/bc/bc/fix-libmath_h#1 branch
.. //depot/projects/gdb/contrib/bc/bc/global.c#1 branch
.. //depot/projects/gdb/contrib/bc/bc/global.h#1 branch
.. //depot/projects/gdb/contrib/bc/bc/libmath.b#1 branch
.. //depot/projects/gdb/contrib/bc/bc/libmath.h#1 branch
.. //depot/projects/gdb/contrib/bc/bc/load.c#1 branch
.. //depot/projects/gdb/contrib/bc/bc/main.c#1 branch
.. //depot/projects/gdb/contrib/bc/bc/proto.h#1 branch
.. //depot/projects/gdb/contrib/bc/bc/sbc.y#1 branch
.. //depot/projects/gdb/contrib/bc/bc/scan.l#1 branch
.. //depot/projects/gdb/contrib/bc/bc/storage.c#1 branch
.. //depot/projects/gdb/contrib/bc/bc/util.c#1 branch
.. //depot/projects/gdb/contrib/bc/config.h.in#1 branch
.. //depot/projects/gdb/contrib/bc/configure#1 branch
.. //depot/projects/gdb/contrib/bc/configure.in#1 branch
.. //depot/projects/gdb/contrib/bc/dc/Makefile.am#1 branch
.. //depot/projects/gdb/contrib/bc/dc/Makefile.in#1 branch
.. //depot/projects/gdb/contrib/bc/dc/array.c#1 branch
.. //depot/projects/gdb/contrib/bc/dc/dc-proto.h#1 branch
.. //depot/projects/gdb/contrib/bc/dc/dc-regdef.h#1 branch
.. //depot/projects/gdb/contrib/bc/dc/dc.c#1 branch
.. //depot/projects/gdb/contrib/bc/dc/dc.h#1 branch
.. //depot/projects/gdb/contrib/bc/dc/eval.c#1 branch
.. //depot/projects/gdb/contrib/bc/dc/misc.c#1 branch
.. //depot/projects/gdb/contrib/bc/dc/numeric.c#1 branch
.. //depot/projects/gdb/contrib/bc/dc/stack.c#1 branch
.. //depot/projects/gdb/contrib/bc/dc/string.c#1 branch
.. //depot/projects/gdb/contrib/bc/doc/Makefile.am#1 branch
.. //depot/projects/gdb/contrib/bc/doc/Makefile.in#1 branch
.. //depot/projects/gdb/contrib/bc/doc/bc.1#1 branch
.. //depot/projects/gdb/contrib/bc/doc/bc.texi#1 branch
.. //depot/projects/gdb/contrib/bc/doc/dc.1#1 branch
.. //depot/projects/gdb/contrib/bc/doc/dc.texi#1 branch
.. //depot/projects/gdb/contrib/bc/h/getopt.h#1 branch
.. //depot/projects/gdb/contrib/bc/h/number.h#1 branch
.. //depot/projects/gdb/contrib/bc/install-sh#1 branch
.. //depot/projects/gdb/contrib/bc/lib/Makefile.am#1 branch
.. //depot/projects/gdb/contrib/bc/lib/Makefile.in#1 branch
.. //depot/projects/gdb/contrib/bc/lib/getopt.c#1 branch
.. //depot/projects/gdb/contrib/bc/lib/getopt1.c#1 branch
.. //depot/projects/gdb/contrib/bc/lib/number.c#1 branch
.. //depot/projects/gdb/contrib/bc/lib/testmul.c#1 branch
.. //depot/projects/gdb/contrib/bc/lib/vfprintf.c#1 branch
.. //depot/projects/gdb/contrib/bc/missing#1 branch
.. //depot/projects/gdb/contrib/bc/mkinstalldirs#1 branch
.. //depot/projects/gdb/contrib/bc/stamp-h.in#1 branch
.. //depot/projects/gdb/contrib/bind/CHANGES#1 branch
.. //depot/projects/gdb/contrib/bind/DNSSEC#1 branch
.. //depot/projects/gdb/contrib/bind/FREEBSD-Upgrade#1 branch
.. //depot/projects/gdb/contrib/bind/FREEBSD-Xlist#1 branch
.. //depot/projects/gdb/contrib/bind/INSTALL#1 branch
.. //depot/projects/gdb/contrib/bind/LICENSE#1 branch
.. //depot/projects/gdb/contrib/bind/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/README#1 branch
.. //depot/projects/gdb/contrib/bind/SUPPORT#1 branch
.. //depot/projects/gdb/contrib/bind/TODO#1 branch
.. //depot/projects/gdb/contrib/bind/Version#1 branch
.. //depot/projects/gdb/contrib/bind/bin/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/addr/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/addr/addr.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/dig/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/dig/dig.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/dnskeygen/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/dnskeygen/dnskeygen.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/dnsquery/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/dnsquery/dnsquery.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/host/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/host/host.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/irpd/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/irpd/irpd.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/irpd/irs-irpd.conf#1 branch
.. //depot/projects/gdb/contrib/bind/bin/irpd/version.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/mkservdb/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/mkservdb/mkservdb.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named-bootconf/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named-bootconf/named-bootconf.sh#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named-bootconf/test.boot#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named-xfer/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named-xfer/named-xfer.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_defs.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_dump.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_func.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_glob.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_glue.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_ixfr.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_load.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_lookup.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_save.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_sec.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_tsig.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/db_update.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/named.conf#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/named.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_config.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_ctl.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_defs.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_forw.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_func.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_glob.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_glue.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_init.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_ixfr.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_lexer.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_lexer.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_main.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_maint.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_ncache.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_notify.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_parser.y#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_parseutil.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_parseutil.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_req.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_resp.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_signal.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_sort.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_stats.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_udp.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_update.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/ns_xfr.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/pathtemplate.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/test/127.0.0.zone#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/test/localhost.zone#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/test/named.conf#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/test/root.hint#1 branch
.. //depot/projects/gdb/contrib/bind/bin/named/version.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/ndc/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/ndc/ndc.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/commands.l#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/debug.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/getinfo.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/list.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/main.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/nslookup.help#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/pathnames.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/res.h#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/send.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/skip.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nslookup/subr.c#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nsupdate/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/bin/nsupdate/nsupdate.c#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/acl.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/address_list.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/comments.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/config.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/controls.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/docdef.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/example.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/include.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/index.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/key.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/logging.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/master.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/options.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/server.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/trusted-keys.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/html/zone.html#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/dig.1#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/dnskeygen.1#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/dnsquery.1#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/getaddrinfo.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/gethostbyname.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/getipnodebyname.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/getnameinfo.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/getnetent.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/hesiod.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/host.1#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/hostname.7#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/inet_cidr.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/irs.conf.5#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/mailaddr.7#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/mkdep.1#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/named-bootconf.8#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/named-xfer.8#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/named.8#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/named.conf.5#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/ndc.8#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/nslookup.8#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/nsupdate.8#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/resolver.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/resolver.5#1 branch
.. //depot/projects/gdb/contrib/bind/doc/man/tsig.3#1 branch
.. //depot/projects/gdb/contrib/bind/doc/misc/DynamicUpdate#1 branch
.. //depot/projects/gdb/contrib/bind/doc/misc/FAQ.1of2#1 branch
.. //depot/projects/gdb/contrib/bind/doc/misc/FAQ.2of2#1 branch
.. //depot/projects/gdb/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch
.. //depot/projects/gdb/contrib/bind/doc/misc/style.txt#1 branch
.. //depot/projects/gdb/contrib/bind/include/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/include/arpa/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/include/arpa/inet.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/arpa/nameser.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/arpa/nameser_compat.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/fd_setsize.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/hesiod.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/irp.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/irs.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/assertions.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/ctl.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/dst.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/eventlib.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/heap.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/irpmarshall.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/list.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/logging.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/memcluster.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/misc.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/isc/tree.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/netdb.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/netgroup.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/res_update.h#1 branch
.. //depot/projects/gdb/contrib/bind/include/resolv.h#1 branch
.. //depot/projects/gdb/contrib/bind/lib/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/README#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/bsafe_link.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/cylink_link.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/dst_api.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/dst_internal.h#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/eay_dss_link.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/hmac_link.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/md5.h#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/md5_dgst.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/md5_locl.h#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/prandom.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/rsaref_link.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/dst/support.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/inet/Makefile#1 branch
.. //depot/projects/gdb/contrib/bind/lib/inet/inet_addr.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/inet/inet_cidr_ntop.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/inet/inet_cidr_pton.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/inet/inet_data.c#1 branch
.. //depot/projects/gdb/contrib/bind/lib/inet/inet_lnaof.c#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 04:55:01 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 68E5716A4D0; Thu, 15 Jan 2004 04:55:01 -0800 (PST)
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 2333B16A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 04:55:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3FCA343D41
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 04:54:57 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FCsv0B051342
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 04:54:57 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FCsLIt051330
	for perforce@freebsd.org; Thu, 15 Jan 2004 04:54:21 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Thu, 15 Jan 2004 04:54:21 -0800 (PST)
Message-Id: <200401151254.i0FCsLIt051330@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 45382 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: Thu, 15 Jan 2004 12:55:01 -0000

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

Change 45382 by cvance@cvance_sony on 2004/01/15 04:53:57

	Integrate SEBSD branch
	Sync with MAC branch (which is currently just past 5.2 release)
	see @45292 for description

Affected files ...

.. //depot/projects/trustedbsd/sebsd/COPYRIGHT#2 integrate
.. //depot/projects/trustedbsd/sebsd/Makefile#7 integrate
.. //depot/projects/trustedbsd/sebsd/Makefile.inc1#7 integrate
.. //depot/projects/trustedbsd/sebsd/UPDATING#7 integrate
.. //depot/projects/trustedbsd/sebsd/bin/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/sebsd/bin/chmod/chmod.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/bin/cp/utils.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/bin/date/date.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/bin/df/df.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/bin/ls/ls.1#5 integrate
.. //depot/projects/trustedbsd/sebsd/bin/ls/ls.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/bin/rm/rm.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/bin/sh/eval.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/amd/fsinfo/fsinfo.8#3 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/bind/CHANGES#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/bind/README#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/bind/Version#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_init.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/named/ns_resp.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/bind/bin/nslookup/commands.l#2 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/cvs/man/cvs.1#2 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/c-lex.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/freebsd.h#5 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/linux-ecoff.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/osf12.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/alpha/osf2or3.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/arm-wince-pe.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/riscix.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/riscix1-1.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/rix-gas.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/arm/t-riscix#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-c4x.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-i128.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-i32.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-i386.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-i64.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-m68k.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-sh.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-sparc.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/float-vax.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/386bsd.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/aix386.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/aix386ng.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/bsd386.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/dgux.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/djgpp-rtems.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd.h#5 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/freebsd64.h#5 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/interix.c#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/isc.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/isccoff.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/iscdbx.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/linux-oldld.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/next.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/osf1-ci.asm#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/osf1-cn.asm#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/osf1elf.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/osf1elfgdb.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/osfelf.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/osfrose.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/rtems.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/seq-gas.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/seq-sysv3.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/seq2-sysv3.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sequent.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sol2gas.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sun.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/sun386.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-dgux#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-next#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-osf#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-osf1elf#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/t-sco5gas#4 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/i386/v3gas.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/nextstep-protos.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/nextstep.c#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/nextstep.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/nextstep21.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/rs6000/softfloat.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/s390/t-linux#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/freebsd.h#5 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/rtems.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sol2-g1.asm#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/sparc/sol27-sld.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/config/t-install-cpp#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mpw-config.in#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/cp/mpw-make.sed#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/dependence.c#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/doc/vms.texi#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/enquire.c#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/version.c#4 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/f/version.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/function.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/gcc.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/ggc-callbacks.c#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/halfpic.c#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/halfpic.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/hash.c#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/hash.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/tradcif.y#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/tradcpp.c#4 delete
.. //depot/projects/trustedbsd/sebsd/contrib/gcc/tradcpp.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/ipfilter/ipmon.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/ipfilter/ipt.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/ipfilter/kmem.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/libf2c/ChangeLog.egcs#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libf2c/libI77/rawio.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libobjc/objc-features.texi#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libreadline/readline.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/generic/bits/limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/aix/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/aix/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/aix/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/generic/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/generic/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/hpux/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/newlib/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/configure.host#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/backward/strstream.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/bits/generic_shadow.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/bits/slice.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/assert.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_climits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/ctype.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/errno.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/fcntl.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/features.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/float.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/iconv.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/iolibio.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/langinfo.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/libio.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/libioP.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/limits.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/locale.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/math.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/pthread.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/setjmp.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/signal.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/stdarg.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/stddef.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/stdio.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/stdlib.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/string.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/sys/cdefs.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/time.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/unistd.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/wchar.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/include/c_shadow/wctype.h#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/mkcshadow#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/libstdc++/mkinclosure#2 delete
.. //depot/projects/trustedbsd/sebsd/contrib/openpam/lib/openpam_ttyconv.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/pnpinfo/pnpinfo.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/tcp_wrappers/socket.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/tcpdump/print-isakmp.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/tcpdump/print-l2tp.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/contrib/tcpdump/print-radius.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/CREDITS#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ChangeLog#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/FREEBSD-upgrade#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/INSTALL#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/LICENCE#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/Makefile.in#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/README.dns#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/README.privsep#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/README.smartcard#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/TODO#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/acconfig.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/atomicio.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/atomicio.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-krb4.c#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-krb5.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-options.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-pam.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-pam.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-passwd.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-rh-rsa.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-rhosts.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-rsa.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-sia.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth-sia.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth1.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-chall.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-gss.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-none.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-pam-freebsd.c#6 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-pam.c#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-pam.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/auth2.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/authfd.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/authfd.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/authfile.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/bufaux.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/bufaux.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/buffer.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/canohost.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/channels.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-3des1.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-aes.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-bf1.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher-ctr.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/cipher.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/clientloop.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/compat.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/compat.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/config.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/configure.ac#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/deattack.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/defines.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/dh.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/dispatch.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/dns.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/dns.h#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/entropy.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/groupaccess.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/gss-genr.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/gss-serv-krb5.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/gss-serv.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/hostfile.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/includes.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/key.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/key.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/log.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/log.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/loginrec.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/loginrec.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/logintest.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/md5crypt.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/md5crypt.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/mdoc2man.awk#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/mdoc2man.pl#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/misc.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/misc.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/moduli.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/moduli.h#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor_fdpass.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor_wrap.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/monitor_wrap.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/msg.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/myproposal.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/nchan.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/Makefile.in#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/base64.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/basename.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/basename.h#3 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bindresvport.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-arc4random.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-arc4random.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-cray.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-cray.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-getpeereid.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-misc.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-nextstep.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-snprintf.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-snprintf.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/bsd-waitpid.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/daemon.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/dirname.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/dirname.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-gai-errnos.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-getnameinfo.c#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-getnameinfo.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-rfc2553.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-rfc2553.h#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/fake-socket.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getcwd.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getcwd.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getgrouplist.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getopt.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getopt.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getrrsetbyname.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/getrrsetbyname.h#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/glob.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/glob.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_aton.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_ntoa.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_ntoa.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_ntop.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/inet_ntop.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/mktemp.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/mktemp.h#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/port-aix.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/port-aix.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/port-irix.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/port-irix.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/realpath.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/realpath.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/rresvport.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/rresvport.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/setenv.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/setenv.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/setproctitle.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/setproctitle.h#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strlcat.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strlcat.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strlcpy.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strlcpy.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strmode.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strmode.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strsep.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/strsep.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/vis.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/vis.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/xcrypt.c#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/xmmap.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/openbsd-compat/xmmap.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/packet.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/packet.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/progressmeter.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/radix.c#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/radix.h#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/readconf.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/readconf.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/README.regress#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/agent-getpeereid.sh#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/agent-ptrace.sh#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/agent-timeout.sh#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/agent.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/authorized_keys_root#2 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/dynamic-forward.sh#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/forwarding.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/proto-version.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/reconfigure.sh#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/rekey.sh#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/sftp-badcmds.sh#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/sftp-batch.sh#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/sftp-cmds.sh#3 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/sftp.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/ssh-com-client.sh#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/ssh-com-keygen.sh#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/ssh-com-sftp.sh#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/ssh-com.sh#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/stderr-after-eof.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/stderr-data.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/test-exec.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/transfer.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/try-ciphers.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/regress/yes-head.sh#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/scard-opensc.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/scard.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/scard.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/scp.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/scp.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/servconf.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/servconf.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/serverloop.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/session.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/session.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-client.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-common.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-int.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp-server.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sftp.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-add.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-add.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-agent.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-agent.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-dss.h#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-gss.h#1 branch
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keygen.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keygen.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keyscan.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keyscan.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keysign.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-keysign.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-rand-helper.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-rsa.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh-rsa.h#4 delete
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh.1#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh2.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh_config#5 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ssh_config.5#5 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshconnect.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshconnect1.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshconnect2.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd_config#6 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshd_config.5#6 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshlogin.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshpty.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/sshtty.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/ttymodes.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/uidswap.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssh/version.h#5 integrate
.. //depot/projects/trustedbsd/sebsd/crypto/openssl/apps/openssl.cnf#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/Makefile#9 integrate
.. //depot/projects/trustedbsd/sebsd/etc/apmd.conf#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/defaults/periodic.conf#5 integrate
.. //depot/projects/trustedbsd/sebsd/etc/defaults/rc.conf#6 integrate
.. //depot/projects/trustedbsd/sebsd/etc/devd.conf#5 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mac.conf#5 integrate
.. //depot/projects/trustedbsd/sebsd/etc/moduli#2 delete
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#8 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.local.dist#6 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.sendmail.dist#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.usr.dist#8 integrate
.. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.var.dist#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/periodic/daily/150.clean-hoststat#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/Makefile#6 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/cleartmp#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/cron#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/diskless#5 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/ike#1 branch
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/initdiskless#6 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/jail#5 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/mountcritlocal#4 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/power_profile#1 branch
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/root#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.d/syscons#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.resume#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.subr#5 integrate
.. //depot/projects/trustedbsd/sebsd/etc/rc.suspend#2 integrate
.. //depot/projects/trustedbsd/sebsd/etc/sendmail/freebsd.mc#4 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes2#7 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes2-o#4 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/freebsd-tips#4 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/murphy#4 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/startrek#5 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/fortune/fortune.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/strfile/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/strfile/strfile.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/lib/libstdc++/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc_int/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc_tools/auto-host.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/f77/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/f771/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/include/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/gzip/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/send-pr/send-pr.sh#6 integrate
.. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/tar/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/Makefile#10 integrate
.. //depot/projects/trustedbsd/sebsd/include/dirent.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/fnmatch.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/ifaddrs.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/locale.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/nss.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/include/paths.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/include/regex.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/resolv.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/include/rpc/types.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/stddef.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/stdio.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/include/stdlib.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/include/string.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/strings.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/time.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/include/unistd.h#5 integrate
.. //depot/projects/trustedbsd/sebsd/include/wchar.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/kerberos5/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/sebsd/kerberos5/include/krb5-private.h#3 delete
.. //depot/projects/trustedbsd/sebsd/lib/Makefile#10 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libc.so.4.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libmp.so.3.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libskey.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libutil.so.3.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libbsnmp/modules/snmp_mibII/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/Makefile#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/gen/fpgetmask.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/gen/fpsetmask.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/gen/makecontext.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/gen/setjmp.S#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/gen/makecontext.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/gdtoa/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/gen/getpwent.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/gen/initgroups.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/gen/opendir.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/gen/sysconf.3#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/gen/ttyname.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/gmon/mcount.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/i386/sys/i386_get_ioperm.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/i386/sys/i386_get_ldt.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/i386/sys/i386_set_ioperm.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/i386/sys/i386_set_ldt.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/i386/sys/i386_vm86.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/ia64/gen/makecontext.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/ia64/gen/signalcontext.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/big5.5#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/euc.4#3 delete
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/euc.5#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/gb18030.5#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/gb2312.5#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/gbk.5#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/gbk.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/localeconv.3#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/mblen.3#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/mbrune.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/mbstowcs.3#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/mbtowc.3#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/mskanji.5#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/multibyte.3#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/rune.3#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/setlocale.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/setlocale.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/setrunelocale.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/srune.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/utf2.4#3 delete
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/utf2.5#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/utf8.5#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/wcstold.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/wcstombs.3#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/locale/wctomb.3#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/net/Makefile.inc#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/net/getifmaddrs.3#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/net/getifmaddrs.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/net/ip6opt.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/net/nss_compat.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/net/res_init.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/net/res_send.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/acl_delete_entry.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/mac.c#7 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/mac_get.3#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/mac_get.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/mac_set.3#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/mac_text.3#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/powerpc/_fpmath.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/rpc/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/fpu/fpu.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/gen/signalcontext.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/sys/__sparc_utrap.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/sys/__sparc_utrap_install.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/sys/__sparc_utrap_setup.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/getc.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/vfscanf.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/vfwprintf.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/vfwscanf.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/atexit.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/atexit.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/exit.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/malloc.c#7 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/stdtime/strptime.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/ffs.3#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/ffs.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/ffsl.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/fls.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/flsl.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/index.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/string/rindex.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/accept.2#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/getfsstat.2#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/getpeername.2#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/getsockname.2#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/getsockopt.2#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/kse.2#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/ktrace.2#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/msync.2#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/ptrace.2#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/recv.2#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/sendfile.2#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/setgroups.2#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/stat.2#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc/sys/statfs.2#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/man/pthread_mutex_init.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/uthread/pthread_private.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/uthread/uthread_create.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/uthread/uthread_init.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/uthread/uthread_join.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/uthread/uthread_rwlock.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/uthread/uthread_sig.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libc_r/uthread/uthread_write.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libio/alpha_sethae.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libkiconv/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libkiconv/kiconv.3#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libkiconv/xlat16_iconv.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libnetgraph/internal.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libnetgraph/msg.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libnetgraph/netgraph.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libnetgraph/sock.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/libpam/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_echo/pam_echo.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_group/pam_group.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_krb5/pam_krb5.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_ksu/pam_ksu.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_login_access/pam_login_access.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_radius/pam_radius.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_radius/pam_radius.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_rhosts/pam_rhosts.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_securetty/pam_securetty.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_unix/pam_unix.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/arch/amd64/amd64/enter_uts.S#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/arch/i386/i386/thr_enter_uts.S#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/arch/ia64/include/pthread_md.h#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_attr.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_equal.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_exit.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_getspecific.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_join.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_key_create.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_key_delete.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_kill.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_mutex_lock.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_mutexattr.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_once.3#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_rwlock_wrlock.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_rwlockattr_setpshared.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_schedparam.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_self.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_setspecific.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_sigmask.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/pthread_testcancel.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/sem_destroy.3#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/sem_getvalue.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/sem_init.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/sem_post.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/sem_wait.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/man/sigwait.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/pthread.map#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_accept.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_aio_suspend.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_cancel.c#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_close.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_cond.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_connect.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_creat.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_create.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fcntl.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fsync.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_init.c#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_join.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_kern.c#7 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_msync.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutex.c#6 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_nanosleep.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_open.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pause.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_poll.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_private.h#7 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pselect.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_read.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_readv.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_rwlock.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_select.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sem.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sig.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigsuspend.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigwait.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sleep.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_spinlock.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_system.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_tcdrain.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_wait.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_wait4.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_waitpid.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_write.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_writev.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libsdp/sdp-int.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libsdp/sdp.3#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libsdp/search.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libsdp/session.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libsdp/util.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libstand/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libstand/gzipfs.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/arch/i386/i386/_setcurthread.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_cond.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_create.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_init.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_kern.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_private.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_resume_np.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_setschedparam.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_sig.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_spinlock.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_subr.c#1 branch
.. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_syscalls.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libusbhid/usbhid.3#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libutil/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/ftpd/ftpd.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/pppoed/pppoed.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/rshd/rshd.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/rtld-elf/amd64/lockdflt.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/rtld-elf/amd64/reloc.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/rtld-elf/amd64/rtld_machdep.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/libexec/tftpd/tftpd.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/release/Makefile#10 integrate
.. //depot/projects/trustedbsd/sebsd/release/Makefile.inc.docports#4 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/errata/article.sgml#6 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#3 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#4 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/installation/common/install.sgml#4 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#4 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/ja_JP.eucJP/early-adopter/article.sgml#5 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/ja_JP.eucJP/errata/article.sgml#5 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#4 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#6 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#5 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate
.. //depot/projects/trustedbsd/sebsd/release/doc/share/sgml/release.ent#4 integrate
.. //depot/projects/trustedbsd/sebsd/release/i386/drivers.conf#6 integrate
.. //depot/projects/trustedbsd/sebsd/release/scripts/mkpkgindex.sh#1 branch
.. //depot/projects/trustedbsd/sebsd/release/scripts/print-cdrom-packages.sh#6 integrate
.. //depot/projects/trustedbsd/sebsd/rescue/rescue/Makefile#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/Makefile#7 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atm/Makefile#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atm/atm_eni.c#4 delete
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atm/atm_show.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/ilmid/ilmid.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/Makefile#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ccdconfig/ccdconfig.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/comcontrol/comcontrol.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/cxconfig/Makefile#2 delete
.. //depot/projects/trustedbsd/sebsd/sbin/cxconfig/cxconfig.8#2 delete
.. //depot/projects/trustedbsd/sebsd/sbin/cxconfig/cxconfig.c#4 delete
.. //depot/projects/trustedbsd/sebsd/sbin/dhclient/Makefile.inc#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dump/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dump/dump.8#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dump/dumprmt.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dump/main.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dumpfs/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dumpfs/dumpfs.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fdisk/fdisk.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck/fsutil.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck/fsutil.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/setup.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/boot.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/check.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/dir.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/dosfs.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/ext.h#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/fat.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsck_msdosfs/main.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsdb/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsdb/fsdb.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsdb/fsdbutil.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/gbde/gbde.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/gpt/add.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/gpt/migrate.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/gpt/recover.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/growfs/growfs.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/idmapd/Makefile#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/idmapd/idmapd.8#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/idmapd/idmapd.c#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/init/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/init/init.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ip6fw/ip6fw.8#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw.8#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw2.c#7 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mdconfig/mdconfig.8#6 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mdmfs/mdmfs.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mdmfs/mdmfs.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mknod/mknod.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount/getmntopts.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#6 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_cd9660/mount_cd9660.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_ext2fs/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/mount_msdosfs.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_nfs4/Makefile#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/mount_nfs4/mount_nfs4.8#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/mount_nfs4/mount_nfs4.c#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/mount_ntfs/mount_ntfs.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_nullfs/mount_nullfs.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_udf/mount_udf.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/newfs/mkfs.c#6 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/newfs/newfs.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/newfs/newfs.h#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/nologin/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/nologin/nologin.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/nologin/nologin.c#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/nologin/nologin.sh#2 delete
.. //depot/projects/trustedbsd/sebsd/sbin/route/route.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/sconfig/Makefile#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/sconfig/sconfig.8#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/sconfig/sconfig.c#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/umount/umount.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/vinum/commands.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/vinum/vinum.8#5 integrate
.. //depot/projects/trustedbsd/sebsd/secure/lib/libssh/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/secure/libexec/sftp-server/Makefile#5 integrate
.. //depot/projects/trustedbsd/sebsd/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/secure/usr.bin/scp/Makefile#3 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 07:36:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 649BC16A4D0; Thu, 15 Jan 2004 07:36:16 -0800 (PST)
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 3B49316A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 07:36:16 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6EBD543D41
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 07:36:15 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FFaF0B087786
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 07:36:15 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FFaEEU087783
	for perforce@freebsd.org; Thu, 15 Jan 2004 07:36:14 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Jan 2004 07:36:14 -0800 (PST)
Message-Id: <200401151536.i0FFaEEU087783@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45387 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: Thu, 15 Jan 2004 15:36:16 -0000

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

Change 45387 by rwatson@rwatson_tislabs on 2004/01/15 07:35:23

	When aborting fork(), make sure to free p_label.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#38 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#38 (text+ko) ====

@@ -738,6 +738,9 @@
 		printf("maxproc limit exceeded by uid %i, please see tuning(7) and login.conf(5).\n",
 			uid);
 	sx_xunlock(&allproc_lock);
+#ifdef MAC
+	mac_destroy_proc(newproc);
+#endif
 	uma_zfree(proc_zone, newproc);
 	if (p1->p_flag & P_SA) {
 		PROC_LOCK(p1);

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 07:47:48 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F19316A4D0; Thu, 15 Jan 2004 07:47:48 -0800 (PST)
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 63F1D16A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 07:47:48 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 52F3943D5D
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 07:47:30 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FFlU0B089992
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 07:47:30 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FFlTNM089989
	for perforce@freebsd.org; Thu, 15 Jan 2004 07:47:29 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Jan 2004 07:47:29 -0800 (PST)
Message-Id: <200401151547.i0FFlTNM089989@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45389 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: Thu, 15 Jan 2004 15:47:49 -0000

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

Change 45389 by rwatson@rwatson_tislabs on 2004/01/15 07:47:02

	Switch audit system calls to MNOSTD as we want to be able to
	compile the kernel without Audit support without stubs.  Also,
	we may want to make Audit a module.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#6 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#6 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#6 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#6 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#6 edit
.. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#6 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#6 (text+ko) ====

@@ -469,14 +469,14 @@
 	{ AS(extattr_list_file_args), (sy_call_t *)extattr_list_file },	/* 438 = extattr_list_file */
 	{ AS(extattr_list_link_args), (sy_call_t *)extattr_list_link },	/* 439 = extattr_list_link */
 	{ SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin },	/* 440 = kse_switchin */
-	{ SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit },	/* 441 = audit */
-	{ SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon },	/* 442 = auditon */
-	{ SYF_MPSAFE | AS(auditsvc_args), (sy_call_t *)auditsvc },	/* 443 = auditsvc */
-	{ SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid },	/* 444 = getauid */
-	{ SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid },	/* 445 = setauid */
-	{ SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit },	/* 446 = getaudit */
-	{ SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit },	/* 447 = setaudit */
-	{ SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr },	/* 448 = getaudit_addr */
-	{ SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr },	/* 449 = setaudit_addr */
-	{ SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl },	/* 450 = auditctl */
+	{ SYF_MPSAFE | AS(audit_args), (sy_call_t *)lkmressys },	/* 441 = audit */
+	{ SYF_MPSAFE | AS(auditon_args), (sy_call_t *)lkmressys },	/* 442 = auditon */
+	{ SYF_MPSAFE | AS(auditsvc_args), (sy_call_t *)lkmressys },	/* 443 = auditsvc */
+	{ SYF_MPSAFE | AS(getauid_args), (sy_call_t *)lkmressys },	/* 444 = getauid */
+	{ SYF_MPSAFE | AS(setauid_args), (sy_call_t *)lkmressys },	/* 445 = setauid */
+	{ SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)lkmressys },	/* 446 = getaudit */
+	{ SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)lkmressys },	/* 447 = setaudit */
+	{ SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)lkmressys },	/* 448 = getaudit_addr */
+	{ SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)lkmressys },	/* 449 = setaudit_addr */
+	{ SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)lkmressys },	/* 450 = auditctl */
 };

==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#6 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#6 (text+ko) ====

@@ -627,17 +627,17 @@
 		    int attrnamespace, void *data, size_t nbytes); }
 440	MSTD	{ int kse_switchin(const struct __mcontext *mcp, \
 		    long val, long *loc); }
-441	MSTD	{ int audit(const void *record, u_int length); }
-442	MSTD	{ int auditon(int cmd, void *data, u_int length); }
-443	MSTD	{ int auditsvc(int fd, int limit); }
-444	MSTD	{ int getauid(uid_t *auid); }
-445	MSTD	{ int setauid(uid_t *auid); }
-446	MSTD	{ int getaudit(struct auditinfo *auditinfo); }
-447	MSTD	{ int setaudit(struct auditinfo *auditinfo); }
-448	MSTD	{ int getaudit_addr(struct auditinfo_addr \
+441	MNOSTD	{ int audit(const void *record, u_int length); }
+442	MNOSTD	{ int auditon(int cmd, void *data, u_int length); }
+443	MNOSTD	{ int auditsvc(int fd, int limit); }
+444	MNOSTD	{ int getauid(uid_t *auid); }
+445	MNOSTD	{ int setauid(uid_t *auid); }
+446	MNOSTD	{ int getaudit(struct auditinfo *auditinfo); }
+447	MNOSTD	{ int setaudit(struct auditinfo *auditinfo); }
+448	MNOSTD	{ int getaudit_addr(struct auditinfo_addr \
 		    *auditinfo_addr, u_int length); }
-449	MSTD	{ int setaudit_addr(struct auditinfo_addr \
+449	MNOSTD	{ int setaudit_addr(struct auditinfo_addr \
 		    *auditinfo_addr, u_int length); }
-450	MSTD	{ int auditctl(char *path); }
+450	MNOSTD	{ int auditctl(char *path); }
 ; Please copy any additions and changes to the following compatability tables:
 ; sys/compat/freebsd32/syscalls.master

==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#6 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#6 (text+ko) ====


==== //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#6 (text+ko) ====

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 08:18:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B58F716A4D0; Thu, 15 Jan 2004 08:18:11 -0800 (PST)
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 8443F16A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:18:11 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CB66443D55
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:18:07 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FGI70B097406
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:18:07 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FGI7O9097403
	for perforce@freebsd.org; Thu, 15 Jan 2004 08:18:07 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Jan 2004 08:18:07 -0800 (PST)
Message-Id: <200401151618.i0FGI7O9097403@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45390 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: Thu, 15 Jan 2004 16:18:12 -0000

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

Change 45390 by rwatson@rwatson_tislabs on 2004/01/15 08:17:28

	- Assert Giant in audit_write(): can't do the VFS thing without it.
	
	- audit() system call is MPSAFE, at least at this layer.  Need to
	  check the BSM routines.
	
	- auditon() is MPSAFE (unimplemented).
	
	- auditsvc() is MPSAFE (unimplemented).
	
	- getauid() is MPSAFE: cache the value protected by the proc lock
	  in a local variable and copyout after releasing the lock.
	
	- setauid() is MPSAFE: copyin to a stack variable, then update
	  holding the process lock.  Audit the argument from the stack
	  variable rather than doing it while holding the process lock.
	
	- getaudit() is MPSAFE: cache the value protected by the proc lock
	  in a local variable, and copyout after releasing the lock.
	
	- setaudit() is MPSAFE: copyin to a stack variable, then update
	  holding the process lock.  XXX: Missing audit of argument here?
	
	- setaudit_addr() is MPSAFE (unimplemented).
	
	- auditctl() is MPSAFE: grab Giant around VFS operations.  XXX:
	  Missing audit of argument here?
	
	- audit_arg_sockaddr(): XXX: Socket locking will be needed here.
	
	- Assert Giant and vnode lock in audit_arg_vnpath().  Remove
	  comment about Darwin not having vnode locking assertions, as
	  FreeBSD does have them.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#13 (text+ko) ====

@@ -164,6 +164,8 @@
 	int ret;
 	struct au_record *bsm;
 
+	mtx_assert(&Giant, MA_OWNED);
+
 	/* 
 	 * If there is a user audit record attached to the kernel record,
 	 * then write the user record.
@@ -482,6 +484,8 @@
  * Begin system calls.            *
  **********************************/
 /*
+ * MPSAFE
+ *
  * System call to allow a user space application to submit a BSM audit
  * record to the kernel for inclusion in the audit log. This function
  * does little verification on the audit record that is submitted.
@@ -538,6 +542,8 @@
 }
 
 /*
+ * MPSAFE
+ *
  *  System call to manipulate auditing.
  */
 /* ARGSUSED */
@@ -553,6 +559,8 @@
 }
 
 /*
+ * MPSAFE
+ *
  *  System call to pass in file descriptor for audit log.
  */
 /* ARGSUSED */
@@ -568,6 +576,8 @@
 }
 
 /* 
+ * MPSAFE
+ *
  * System calls to manage the user audit information.
  * XXXAUDIT May need to lock the proc structure.
  */
@@ -576,75 +586,100 @@
 getauid(struct thread *td, struct getauid_args *uap)
 {
 	int error;
+	au_id_t id;
 
 	error = suser(td);
 	if (error)
 		return (error);
 
-	error = copyout((void *)&td->td_proc->p_au->ai_auid, (void *)uap->auid, 
-				sizeof(*uap->auid));
-	if (error)
-		return (error);
-
-	return (0);
+	/*
+	 * XXX:
+	 * Integer read on static pointer dereference: doesn't need locking?
+	 */
+	PROC_LOCK(td->td_proc);
+	id = td->td_proc->p_au->ai_auid;
+	PROC_UNLOCK(td->td_proc);
+	return (copyout(&id, uap->auid, sizeof(id)));
 }
 
+/* MPSAFE */
 /* ARGSUSED */
 int
 setauid(struct thread *td, struct setauid_args *uap)
 {
 	int error;
+	au_id_t id;
 
 	error = suser(td);
 	if (error)
 		return (error);
 
-	error = copyin((void *)uap->auid, (void *)&td->td_proc->p_au->ai_auid, 
-				sizeof(td->td_proc->p_au->ai_auid));
+	error = copyin(uap->auid, &id, sizeof(id));
 	if (error)
 		return (error);
 
-	audit_arg_auid(td->td_proc->p_au->ai_auid);
+	audit_arg_auid(id);
+
+	/*
+	 * XXX:
+	 * Integer write on static pointer dereference: doesn't need locking?
+	 */
+	PROC_LOCK(td->td_proc);
+	td->td_proc->p_au->ai_auid = id;
+	PROC_UNLOCK(td->td_proc);
+
 	return (0);
 }
 
 /*
+ * MPSAFE
  *  System calls to get and set process audit information.
  */
 /* ARGSUSED */
 int
 getaudit(struct thread *td, struct getaudit_args *uap)
 {
+	struct auditinfo ai;
 	int error;
 
 	error = suser(td);
 	if (error)
 		return (error);
-	error = copyout((void *)td->td_proc->p_au, (void *)uap->auditinfo, 
-				sizeof(*uap->auditinfo));
-	if (error)
-		return (error);
+
+	PROC_LOCK(td->td_proc);
+	ai = *td->td_proc->p_au;
+	PROC_UNLOCK(td->td_proc);
 
-	return (0);
+	return (copyout(&ai, uap->auditinfo, sizeof(ai)));
 }
 
+/* MPSAFE */
 /* ARGSUSED */
 int
 setaudit(struct thread *td, struct setaudit_args *uap)
 {
+	struct auditinfo ai;
 	int error;
 
 	error = suser(td);
 	if (error)
 		return (error);
-	error = copyin((void *)uap->auditinfo, (void *)td->td_proc->p_au, 
-				sizeof(*td->td_proc->p_au));
+
+	error = copyin(uap->auditinfo, &ai, sizeof(ai));
 	if (error)
 		return (error);
 
+	/*
+	 * XXX: Shouldn't the arguments here be audited?
+	 */
+	PROC_LOCK(td->td_proc);
+	*td->td_proc->p_au = ai;
+	PROC_UNLOCK(td->td_proc);
+
 	return (0);
 }
 
+/* MPSAFE */
 /* ARGSUSED */
 int
 getaudit_addr(struct thread *td, struct getaudit_addr_args *uap)
@@ -657,6 +692,7 @@
 	return (ENOSYS);
 }
 
+/* MPSAFE */
 /* ARGSUSED */
 int
 setaudit_addr(struct thread *td, struct setaudit_addr_args *uap)
@@ -670,6 +706,7 @@
 }
 
 /*
+ * MPSAFE
  * Syscall to manage audit files.
  *
  * XXX: Should generate an audit event.
@@ -696,26 +733,29 @@
 	 * credential.
 	 */
 	if (uap->path != NULL) {
+		mtx_lock(&Giant);
 		NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE,
 		    uap->path, td);
 		flags = audit_open_flags;
 		error = vn_open(&nd, &flags, 0, -1);
-		if (error)
-			goto out;
+		if (error) {
+			mtx_unlock(&Giant);
+			return (error);
+		}
 		VOP_UNLOCK(nd.ni_vp, 0, td);
 		vp = nd.ni_vp;
 		if (vp->v_type != VREG) {
 			vn_close(vp, audit_close_flags, td->td_ucred, td);
-			error = EINVAL;
-			goto out;
+			mtx_lock(&Giant);
+			return (EINVAL);
 		}
 		cred = td->td_ucred;
 		crhold(cred);
+		mtx_unlock(&Giant);
 	}
 
 	audit_rotate_vnode(cred, vp);
-out:
-	return (error);
+	return (0);
 }
 
 /**********************************
@@ -1135,6 +1175,9 @@
 	if (ar == NULL || td == NULL || so == NULL)
 		return;
 
+	/*
+	 * XXX: Socket locking?
+	 */
 	bcopy(so, &ar->k_ar.ar_arg_sockaddr, sizeof(ar->k_ar.ar_arg_sockaddr));
 	switch (so->sa_family) {
 	case AF_INET:
@@ -1367,6 +1410,9 @@
 	if (vp == NULL)
 		return;
 
+	mtx_assert(&Giant, MA_OWNED);
+	ASSERT_VOP_LOCKED(vp, "audit_arg_vnpath")
+
 	ar = currecord();
 	if (ar == NULL)	/* This will be the case for unaudited system calls */
 		return;
@@ -1406,10 +1452,6 @@
 	else
 		ar->k_ar.ar_valid_arg |= ARG_KPATH2;
 
-	/*
-	 * XXX: We'd assert the vnode lock here, only Darwin doesn't
-	 * appear to have vnode locking assertions.
-	 */
 	error = VOP_GETATTR(vp, &vattr, td->td_ucred, td);
 	if (error) {
 		/* XXX: How to handle this case? */

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 08:27:21 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3EBAD16A4D0; Thu, 15 Jan 2004 08:27:21 -0800 (PST)
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 1AE1D16A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:27:21 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7608C43D49
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:27:19 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FGRJ0B099455
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:27:19 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FGRJNa099452
	for perforce@freebsd.org; Thu, 15 Jan 2004 08:27:19 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Jan 2004 08:27:19 -0800 (PST)
Message-Id: <200401151627.i0FGRJNa099452@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45391 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: Thu, 15 Jan 2004 16:27:21 -0000

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

Change 45391 by rwatson@rwatson_tislabs on 2004/01/15 08:26:17

	Assert Giant for VFS.
	Lock fdp while accessing it to find current/root directories.
	Vref the vnodes before releasing the file descriptor lock.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#9 (text+ko) ====

@@ -729,11 +729,11 @@
 	struct vnode *vnp;
 	struct filedesc *fdp;
 
-	/*
-	 * XXX: file descriptor locking!
-	 */
+	mtx_assert(&Giant, MA_OWNED);
+
 	fdp = td->td_proc->p_fd;
 	bufp = path;
+	FILEDESC_LOCK(fdp);
 	if (*(path) == '/') {
 		while (*(bufp) == '/') 
 			bufp++;			/* skip leading '/'s	     */
@@ -746,11 +746,14 @@
 			bufp--;			/* restore one '/'	     */
 		} else {
 			vnp = fdp->fd_rdir;	/* use process root	     */
+			vref(vnp);
 		}
 	} else {
 		vnp = fdp->fd_cdir;	/* prepend the current dir  */
+		vref(vnp);
 		bufp = path;
 	}
+	FILEDESC_UNLOCK(fdp);
 	if (vnp != NULL) {
 		/*
 		 * XXX: Should lock vnode!
@@ -765,7 +768,7 @@
 		vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY, td);
 		if (vn_fullpath(NULL, vnp, cpath, MAXPATHLEN) != 0)
 			cpath[0] = '\0';
-		VOP_UNLOCK(vnp, 0, td);
+		vput(vnp);
 		len = strlen(cpath);
 		strncpy(cpath + len-1, bufp, MAXPATHLEN - len);
 	} else {

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 08:35:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 32CDF16A4D0; Thu, 15 Jan 2004 08:35:53 -0800 (PST)
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 0AAE116A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:35:53 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5FB5443D64
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:35:38 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FGZc0B001719
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:35:38 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FGZT71001715
	for perforce@freebsd.org; Thu, 15 Jan 2004 08:35:29 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Thu, 15 Jan 2004 08:35:29 -0800 (PST)
Message-Id: <200401151635.i0FGZT71001715@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45392 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: Thu, 15 Jan 2004 16:35:53 -0000

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

Change 45392 by sam@sam_ebb on 2004/01/15 08:34:54

	IFC

Affected files ...

.. //depot/projects/netperf/sys/alpha/include/sysarch.h#2 integrate
.. //depot/projects/netperf/sys/amd64/include/sysarch.h#3 integrate
.. //depot/projects/netperf/sys/boot/forth/beastie.4th#5 integrate
.. //depot/projects/netperf/sys/boot/i386/cdboot/cdboot.s#3 integrate
.. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#12 integrate
.. //depot/projects/netperf/sys/compat/linux/linux_util.c#2 integrate
.. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#11 integrate
.. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#9 integrate
.. //depot/projects/netperf/sys/compat/ndis/pe_var.h#3 integrate
.. //depot/projects/netperf/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#12 integrate
.. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#8 integrate
.. //depot/projects/netperf/sys/compat/ndis/subr_pe.c#5 integrate
.. //depot/projects/netperf/sys/conf/files#32 integrate
.. //depot/projects/netperf/sys/conf/files.alpha#4 integrate
.. //depot/projects/netperf/sys/conf/files.i386#10 integrate
.. //depot/projects/netperf/sys/conf/files.ia64#10 integrate
.. //depot/projects/netperf/sys/conf/files.pc98#8 integrate
.. //depot/projects/netperf/sys/conf/files.powerpc#2 integrate
.. //depot/projects/netperf/sys/conf/files.sparc64#6 integrate
.. //depot/projects/netperf/sys/conf/kern.post.mk#8 integrate
.. //depot/projects/netperf/sys/conf/majors#10 integrate
.. //depot/projects/netperf/sys/conf/newvers.sh#5 integrate
.. //depot/projects/netperf/sys/conf/options.i386#10 integrate
.. //depot/projects/netperf/sys/contrib/dev/acpica/exstore.c#3 integrate
.. //depot/projects/netperf/sys/dev/acpica/Osd/OsdTable.c#2 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi.c#18 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_thermal.c#7 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpivar.h#8 integrate
.. //depot/projects/netperf/sys/dev/an/if_an.c#8 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-all.c#12 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-all.h#7 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-card.c#6 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-cbus.c#4 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#16 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-disk.c#8 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-dma.c#10 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-isa.c#5 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#14 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-pci.c#9 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-queue.c#9 integrate
.. //depot/projects/netperf/sys/dev/ata/ata-raid.c#8 integrate
.. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#11 integrate
.. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#17 integrate
.. //depot/projects/netperf/sys/dev/ata/atapi-fd.c#5 integrate
.. //depot/projects/netperf/sys/dev/ata/atapi-tape.c#5 integrate
.. //depot/projects/netperf/sys/dev/awi/am79c930.c#3 integrate
.. //depot/projects/netperf/sys/dev/awi/am79c930reg.h#2 integrate
.. //depot/projects/netperf/sys/dev/awi/am79c930var.h#2 integrate
.. //depot/projects/netperf/sys/dev/awi/awi.c#3 integrate
.. //depot/projects/netperf/sys/dev/awi/awi_wep.c#4 delete
.. //depot/projects/netperf/sys/dev/awi/awi_wicfg.c#3 delete
.. //depot/projects/netperf/sys/dev/awi/awireg.h#2 integrate
.. //depot/projects/netperf/sys/dev/awi/awivar.h#2 integrate
.. //depot/projects/netperf/sys/dev/awi/if_awi_pccard.c#4 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bge.c#16 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bgereg.h#8 integrate
.. //depot/projects/netperf/sys/dev/bktr/bktr_os.c#8 integrate
.. //depot/projects/netperf/sys/dev/firewire/firewire.c#10 integrate
.. //depot/projects/netperf/sys/dev/firewire/fwohci.c#10 integrate
.. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#11 integrate
.. //depot/projects/netperf/sys/dev/firewire/sbp.c#13 integrate
.. //depot/projects/netperf/sys/dev/ida/ida.c#3 integrate
.. //depot/projects/netperf/sys/dev/ida/ida_disk.c#3 integrate
.. //depot/projects/netperf/sys/dev/ida/ida_eisa.c#3 integrate
.. //depot/projects/netperf/sys/dev/ida/ida_pci.c#5 integrate
.. //depot/projects/netperf/sys/dev/ida/idaio.h#1 branch
.. //depot/projects/netperf/sys/dev/ida/idareg.h#2 integrate
.. //depot/projects/netperf/sys/dev/ida/idavar.h#2 integrate
.. //depot/projects/netperf/sys/dev/idt/idt.c#5 integrate
.. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/netperf/sys/dev/if_ndis/if_ndisvar.h#5 integrate
.. //depot/projects/netperf/sys/dev/ispfw/asm_12160.h#2 integrate
.. //depot/projects/netperf/sys/dev/ispfw/asm_2200.h#2 integrate
.. //depot/projects/netperf/sys/dev/ispfw/asm_2300.h#2 integrate
.. //depot/projects/netperf/sys/dev/md/md.c#9 integrate
.. //depot/projects/netperf/sys/dev/pci/pci_pci.c#5 integrate
.. //depot/projects/netperf/sys/dev/pci/pci_user.c#5 integrate
.. //depot/projects/netperf/sys/dev/pci/pcib_private.h#3 integrate
.. //depot/projects/netperf/sys/dev/pdq/pdqvar.h#3 integrate
.. //depot/projects/netperf/sys/dev/sound/pci/emu10k1.c#5 integrate
.. //depot/projects/netperf/sys/dev/trm/trm.c#7 integrate
.. //depot/projects/netperf/sys/dev/usb/uhci.c#4 integrate
.. //depot/projects/netperf/sys/dev/usb/uhci_pci.c#6 integrate
.. //depot/projects/netperf/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/netperf/sys/dev/usb/usbdevs#12 integrate
.. //depot/projects/netperf/sys/dev/usb/usbdevs.h#12 integrate
.. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#12 integrate
.. //depot/projects/netperf/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/netperf/sys/fs/smbfs/smbfs_smb.c#2 integrate
.. //depot/projects/netperf/sys/fs/smbfs/smbfs_vnops.c#6 integrate
.. //depot/projects/netperf/sys/geom/geom_subr.c#5 integrate
.. //depot/projects/netperf/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate
.. //depot/projects/netperf/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/netperf/sys/gnu/dev/sound/pci/emu10k1.h#2 integrate
.. //depot/projects/netperf/sys/i386/acpica/acpi_toshiba.c#1 branch
.. //depot/projects/netperf/sys/i386/conf/NOTES#14 integrate
.. //depot/projects/netperf/sys/i386/i386/pmap.c#27 integrate
.. //depot/projects/netperf/sys/i386/include/sysarch.h#3 integrate
.. //depot/projects/netperf/sys/ia64/include/cpufunc.h#3 integrate
.. //depot/projects/netperf/sys/ia64/include/sysarch.h#4 integrate
.. //depot/projects/netperf/sys/kern/init_main.c#6 integrate
.. //depot/projects/netperf/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/netperf/sys/kern/kern_fork.c#8 integrate
.. //depot/projects/netperf/sys/kern/kern_intr.c#6 integrate
.. //depot/projects/netperf/sys/kern/kern_sig.c#11 integrate
.. //depot/projects/netperf/sys/kern/kern_thread.c#11 integrate
.. //depot/projects/netperf/sys/kern/sys_pipe.c#13 integrate
.. //depot/projects/netperf/sys/kern/tty.c#3 integrate
.. //depot/projects/netperf/sys/kern/uipc_syscalls.c#12 integrate
.. //depot/projects/netperf/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/netperf/sys/kern/vfs_syscalls.c#10 integrate
.. //depot/projects/netperf/sys/libkern/ffs.c#2 integrate
.. //depot/projects/netperf/sys/libkern/ffsl.c#1 branch
.. //depot/projects/netperf/sys/libkern/fls.c#1 branch
.. //depot/projects/netperf/sys/libkern/flsl.c#1 branch
.. //depot/projects/netperf/sys/modules/Makefile#14 integrate
.. //depot/projects/netperf/sys/modules/acpi/Makefile#7 integrate
.. //depot/projects/netperf/sys/modules/acpi/Makefile.inc#1 branch
.. //depot/projects/netperf/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/acpi/acpi_toshiba/Makefile#1 branch
.. //depot/projects/netperf/sys/modules/awi/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/cx/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/drm/mga/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/drm/r128/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/drm/radeon/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/drm/sis/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/drm/tdfx/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/ida/Makefile#1 branch
.. //depot/projects/netperf/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/bluetooth/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/bt3c/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/h4/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/hci/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/l2cap/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/socket/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/netgraph/fec/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/sound/driver/emu10k1/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/ubsa/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/ucom/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/udf/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/ufm/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/uftdi/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/umct/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/uplcom/Makefile#3 integrate
.. //depot/projects/netperf/sys/modules/uvisor/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/uvscom/Makefile#2 integrate
.. //depot/projects/netperf/sys/net/if_atmsubr.c#4 integrate
.. //depot/projects/netperf/sys/net/if_media.h#4 integrate
.. //depot/projects/netperf/sys/net80211/ieee80211.c#8 integrate
.. //depot/projects/netperf/sys/net80211/ieee80211.h#6 integrate
.. //depot/projects/netperf/sys/net80211/ieee80211_input.c#19 integrate
.. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#12 integrate
.. //depot/projects/netperf/sys/net80211/ieee80211_var.h#13 integrate
.. //depot/projects/netperf/sys/netgraph/ng_ether.c#6 integrate
.. //depot/projects/netperf/sys/netgraph/ng_rfc1490.c#2 integrate
.. //depot/projects/netperf/sys/netgraph/ng_rfc1490.h#3 integrate
.. //depot/projects/netperf/sys/netinet/in_pcb.c#22 integrate
.. //depot/projects/netperf/sys/netinet/ip_icmp.c#14 integrate
.. //depot/projects/netperf/sys/netinet/ip_output.c#21 integrate
.. //depot/projects/netperf/sys/netinet/tcp.h#4 integrate
.. //depot/projects/netperf/sys/netinet/tcp_input.c#17 integrate
.. //depot/projects/netperf/sys/netinet/tcp_subr.c#16 integrate
.. //depot/projects/netperf/sys/netinet/tcp_usrreq.c#10 integrate
.. //depot/projects/netperf/sys/netinet/tcp_var.h#6 integrate
.. //depot/projects/netperf/sys/netinet6/in6.c#17 integrate
.. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#13 integrate
.. //depot/projects/netperf/sys/netinet6/in6_pcb.c#15 integrate
.. //depot/projects/netperf/sys/netinet6/ipsec.c#8 integrate
.. //depot/projects/netperf/sys/netkey/key.c#12 integrate
.. //depot/projects/netperf/sys/pc98/conf/NOTES#11 integrate
.. //depot/projects/netperf/sys/pc98/i386/machdep.c#12 integrate
.. //depot/projects/netperf/sys/pci/if_dc.c#17 integrate
.. //depot/projects/netperf/sys/pci/if_dcreg.h#6 integrate
.. //depot/projects/netperf/sys/pci/ncr.c#5 integrate
.. //depot/projects/netperf/sys/powerpc/include/nexusvar.h#2 integrate
.. //depot/projects/netperf/sys/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/netperf/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/netperf/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/netperf/sys/powerpc/powermac/openpic_macio.c#1 branch
.. //depot/projects/netperf/sys/powerpc/powerpc/nexus.c#2 integrate
.. //depot/projects/netperf/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/netperf/sys/powerpc/psim/ata_iobus.c#3 integrate
.. //depot/projects/netperf/sys/powerpc/psim/openpic_iobus.c#1 branch
.. //depot/projects/netperf/sys/rpc/rpcclnt.c#3 integrate
.. //depot/projects/netperf/sys/sparc64/include/ofw_machdep.h#3 integrate
.. //depot/projects/netperf/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/netperf/sys/sparc64/sparc64/ofw_machdep.c#6 integrate
.. //depot/projects/netperf/sys/sys/filedesc.h#3 integrate
.. //depot/projects/netperf/sys/sys/libkern.h#2 integrate
.. //depot/projects/netperf/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/netperf/sys/vm/vm_extern.h#4 integrate
.. //depot/projects/netperf/sys/vm/vm_kern.c#12 integrate
.. //depot/projects/netperf/sys/vm/vm_page.c#14 integrate

Differences ...

==== //depot/projects/netperf/sys/alpha/include/sysarch.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.6 2002/03/20 18:58:45 obrien Exp $
+ * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.7 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -52,6 +52,7 @@
 
 __BEGIN_DECLS
 int		alpha_sethae(u_int64_t);
+int		sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/netperf/sys/amd64/include/sysarch.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.21 2003/10/23 06:06:14 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.22 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -50,9 +50,10 @@
 
 __BEGIN_DECLS
 int amd64_get_fsbase(void **);
+int amd64_get_gsbase(void **);
 int amd64_set_fsbase(void *);
-int amd64_get_gsbase(void **);
 int amd64_set_gsbase(void *);
+int sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/netperf/sys/boot/forth/beastie.4th#5 (text+ko) ====

@@ -23,7 +23,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $
 
 marker task-beastie.4th
 
@@ -228,6 +228,7 @@
 				s" acpi_load" unsetenv
 				s" 1" s" hint.acpi.0.disabled" setenv
 				s" 1" s" loader.acpi_disabled_by_user" setenv
+				s" 1" s" hint.apic.0.disabled" setenv
 			then
 			s" 0" s" hw.ata.ata_dma" setenv
 			s" 0" s" hw.ata.atapi_dma" setenv

==== //depot/projects/netperf/sys/boot/i386/cdboot/cdboot.s#3 (text+ko) ====

@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.10 2003/12/11 22:42:50 jhb Exp $
+# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.11 2004/01/12 20:34:42 jhb Exp $
 
 #
 # This program is a freestanding boot program to load an a.out binary
@@ -165,7 +165,7 @@
 #
 		mov DIR_SIZE(%bx),%eax		# Read file length
 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors
-		shr $11,%eax
+		shr $SECTOR_SHIFT,%eax
 		cmp $BUFFER_LEN,%eax
 		jbe load_sizeok
 		mov $msg_load2big,%si		# Error message
@@ -400,6 +400,7 @@
 # Trashes: EAX
 #
 read:		push %si			# Save
+		push %cx			# Save since some BIOSs trash
 		mov %eax,edd_lba		# LBA to read from
 		mov %ebx,%eax			# Convert address
 		shr $4,%eax			#  to segment
@@ -413,7 +414,8 @@
 		int $0x13			# Call BIOS
 		pop %dx				# Restore
 		jc read.fail			# Worked?
-		pop %si				# Restore
+		pop %cx				# Restore
+		pop %si
 		ret				# Return
 read.fail:	cmp $ERROR_TIMEOUT,%ah		# Timeout?
 		je read.retry			# Yes, Retry.
@@ -460,6 +462,7 @@
 		mov twiddle_chars,%bx		# Address table
 		inc %al				# Next
 		and $3,%al			#  char
+		mov %al,twiddle_index		# Save index for next call
 		xlat				# Get char
 		call putc			# Output it
 		mov $8,%al			# Backspace

==== //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#12 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.80 2004/01/02 19:29:31 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.81 2004/01/12 03:14:37 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -352,7 +352,7 @@
 	/* resolve symlinks etc. in the emulation tree prefix */
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
-	if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) == -1)
+	if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) != 0)
 		lep = linux_emul_path;
 	else
 		lep = dlep;

==== //depot/projects/netperf/sys/compat/linux/linux_util.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.23 2003/06/10 21:27:40 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.24 2004/01/14 22:38:03 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,8 +96,6 @@
 {
 	struct nameidata	 nd;
 	struct nameidata	 ndroot;
-	struct vattr		 vat;
-	struct vattr		 vatroot;
 	int			 error;
 	const char		*prefix;
 	char			*ptr, *buf, *cp;
@@ -169,17 +167,7 @@
 			goto keeporig;
 		}
 
-		if ((error = VOP_GETATTR(nd.ni_vp, &vat, td->td_ucred, td)) != 0) {
-			goto bad;
-		}
-
-		if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, td->td_ucred, td))
-		    != 0) {
-			goto bad;
-		}
-
-		if (vat.va_fsid == vatroot.va_fsid &&
-		    vat.va_fileid == vatroot.va_fileid) {
+		if (nd.ni_vp == ndroot.ni_vp) {
 			error = ENOENT;
 			goto bad;
 		}

==== //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.23 2004/01/07 06:15:56 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.29 2004/01/13 22:49:45 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -75,7 +75,6 @@
 #include <compat/ndis/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
-#define __stdcall __attribute__((__stdcall__))
 #define NDIS_DUMMY_PATH "\\\\some\\bogus\\path"
 
 __stdcall static void ndis_status_func(ndis_handle, ndis_status,
@@ -151,7 +150,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 
-	device_printf (block->nmb_dev, "status: %x\n", status);
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "status: %x\n", status);
 	return;
 }
 
@@ -162,7 +162,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 	
-	device_printf (block->nmb_dev, "status complete\n");
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "status complete\n");
 	return;
 }
 
@@ -201,7 +202,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 
-	device_printf (block->nmb_dev, "reset done...\n");
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "reset done...\n");
 	return;
 }
 
@@ -305,17 +307,17 @@
 	    "NDIS API Version", "0x00050001", CTLFLAG_RD);
 
 	/* Bus type (PCI, PCMCIA, etc...) */
-	sprintf(buf, "%d\n", (int)sc->ndis_iftype);
+	sprintf(buf, "%d", (int)sc->ndis_iftype);
 	ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
 
 	if (sc->ndis_res_io != NULL) {
-		sprintf(buf, "0x%lx\n", rman_get_start(sc->ndis_res_io));
+		sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
 		ndis_add_sysctl(sc, "IOBaseAddress",
 		    "Base I/O Address", buf, CTLFLAG_RD);
 	}
 
 	if (sc->ndis_irq != NULL) {
-		sprintf(buf, "%lu\n", rman_get_start(sc->ndis_irq));
+		sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
 		ndis_add_sysctl(sc, "InterruptNumber",
 		    "Interrupt Number", buf, CTLFLAG_RD);
 	}
@@ -600,6 +602,7 @@
 	priv = &(*p)->np_private;
 	priv->npp_totlen = m0->m_pkthdr.len;
         priv->npp_packetooboffset = offsetof(ndis_packet, np_oob);
+	priv->npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
 
 	for (m = m0; m != NULL; m = m->m_next) {
 		if (m->m_len == 0)
@@ -1080,6 +1083,8 @@
 	return(0);
 }
 
+#define NDIS_LOADED		0x42534F44
+
 int
 ndis_load_driver(img, arg)
 	vm_offset_t		img;
@@ -1098,22 +1103,34 @@
 
 	sc = arg;
 
-	/* Perform text relocation */
-	if (pe_relocate(img))
-		return(ENOEXEC);
+	/*
+	 * Only perform the relocation/linking phase once
+	 * since the binary image may be shared among multiple
+	 * device instances.
+	 */
 
-        /* Dynamically link the NDIS.SYS routines -- required. */
-	if (pe_patch_imports(img, "NDIS", ndis_functbl))
-		return(ENOEXEC);
+	ptr = (uint32_t *)(img + 8);
+	if (*ptr != NDIS_LOADED) {
+		/* Perform text relocation */
+		if (pe_relocate(img))
+			return(ENOEXEC);
 
-	/* Dynamically link the HAL.dll routines -- also required. */
-	if (pe_patch_imports(img, "HAL", hal_functbl))
-		return(ENOEXEC);
+		/* Dynamically link the NDIS.SYS routines -- required. */
+		if (pe_patch_imports(img, "NDIS", ndis_functbl))
+			return(ENOEXEC);
 
-	/* Dynamically link ntoskrnl.exe -- optional. */
-	if (pe_get_import_descriptor(img, &imp_desc, "ntoskrnl") == 0) {
-		if (pe_patch_imports(img, "ntoskrnl", ntoskrnl_functbl))
+		/* Dynamically link the HAL.dll routines -- also required. */
+		if (pe_patch_imports(img, "HAL", hal_functbl))
 			return(ENOEXEC);
+
+		/* Dynamically link ntoskrnl.exe -- optional. */
+		if (pe_get_import_descriptor(img,
+		    &imp_desc, "ntoskrnl") == 0) {
+			if (pe_patch_imports(img,
+			    "ntoskrnl", ntoskrnl_functbl))
+				return(ENOEXEC);
+		}
+		*ptr = NDIS_LOADED;
 	}
 
         /* Locate the driver entry point */

==== //depot/projects/netperf/sys/compat/ndis/ndis_var.h#9 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.12 2004/01/06 07:09:26 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.15 2004/01/12 03:49:20 wpaul Exp $
  */
 
 #ifndef _NDIS_VAR_H_
@@ -443,7 +443,7 @@
 
 struct ndis_80211_bssid_list_ex {
 	uint32_t		nblx_items;
-	ndis_wlan_bssid		nblx_bssid[1];
+	ndis_wlan_bssid_ex	nblx_bssid[1];
 };
 
 typedef struct ndis_80211_bssid_list_ex ndis_80211_bssid_list_ex;
@@ -808,7 +808,7 @@
  */
 struct ndis_miniport_interrupt {
 	void			*ni_introbj;
-	ndis_spin_lock		ni_dpccountlock;
+	ndis_kspin_lock		ni_dpccountlock;
 	void			*ni_rsvd;
 	void			*ni_isrfunc;
 	void			*ni_dpcfunc;
@@ -919,6 +919,10 @@
 #define NDIS_FLAGS_SENT_AT_DPC                  0x00001000
 #define NDIS_FLAGS_USES_SG_BUFFER_LIST          0x00002000
 
+#define NDIS_PACKET_WRAPPER_RESERVED			0x3F
+#define NDIS_PACKET_CONTAINS_MEDIA_SPECIFIC_INFO	0x40
+#define NDIS_PACKET_ALLOCATED_BY_NDIS			0x80
+
 #define NDIS_PROTOCOL_ID_DEFAULT        0x00
 #define NDIS_PROTOCOL_ID_TCP_IP         0x02
 #define NDIS_PROTOCOL_ID_IPX            0x06
@@ -1157,6 +1161,14 @@
 
 TAILQ_HEAD(nte_head, ndis_timer_entry);
 
+struct ndis_fh {
+	void			*nf_vp;
+	void			*nf_map;
+	uint32_t		nf_maplen; 
+};
+
+typedef struct ndis_fh ndis_fh;
+
 /*
  * The miniport block is basically the internal NDIS handle. We need
  * to define this because, unfortunately, it is not entirely opaque

==== //depot/projects/netperf/sys/compat/ndis/pe_var.h#3 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.3 2004/01/06 18:06:54 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.4 2004/01/13 22:49:45 obrien Exp $
  */
 
 #ifndef _PE_VAR_H_
@@ -408,6 +408,20 @@
 
 typedef struct image_patch_table image_patch_table;
 
+/*
+ * Note: Windows uses the _stdcall calling convention. This means
+ * that the callback functions provided in the function table must
+ * be declared using __attribute__((__stdcall__)), otherwise the
+ * Windows code will likely screw up the %esp register and cause
+ * us to jump to an invalid address when it returns.
+ */
+
+#ifdef __amd64__
+#define __stdcall
+#else
+#define __stdcall __attribute__((__stdcall__))
+#endif
+
 __BEGIN_DECLS
 extern int pe_get_dos_header(vm_offset_t, image_dos_header *);
 extern int pe_is_nt_image(vm_offset_t);

==== //depot/projects/netperf/sys/compat/ndis/subr_hal.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.3 2004/01/03 09:20:48 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.6 2004/01/13 22:49:45 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -55,7 +55,6 @@
 #include <compat/ndis/hal_var.h>
 #include <compat/ndis/ntoskrnl_var.h>
 
-#define __stdcall __attribute__((__stdcall__))
 #define FUNC void(*)(void)
 
 __stdcall static void hal_stall_exec_cpu(uint32_t);
@@ -82,6 +81,8 @@
 __stdcall static uint8_t hal_irql(void);
 __stdcall static void dummy (void);
 
+extern struct mtx_pool *ndis_mtxpool;
+
 __stdcall static void
 hal_stall_exec_cpu(usecs)
 	uint32_t		usecs;
@@ -211,7 +212,7 @@
 
 	__asm__ __volatile__ ("" : "=c" (lock));
 
-	mtx_lock((struct mtx *)*lock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)*lock);
 	return(0);
 }
 
@@ -223,7 +224,7 @@
 
 	__asm__ __volatile__ ("" : "=c" (lock), "=d" (newiqrl));
 
-	mtx_unlock((struct mtx *)*lock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)*lock);
 	return;
 }
 

==== //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#12 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.30 2004/01/07 19:26:47 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.37 2004/01/15 07:42:26 wpaul Exp $");
 
 /*
  * This file implements a translation layer between the BSD networking
@@ -65,6 +65,10 @@
 #include <sys/smp.h>
 #include <sys/queue.h>
 #include <sys/taskqueue.h>
+#include <sys/proc.h>
+#include <sys/namei.h>
+#include <sys/fcntl.h>
+#include <sys/vnode.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -96,10 +100,14 @@
 #include <compat/ndis/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
-#define __stdcall __attribute__((__stdcall__))
 #define FUNC void(*)(void)
 
-static struct mtx ndis_interlock;
+static struct mtx *ndis_interlock;
+static char ndis_filepath[MAXPATHLEN];
+struct mtx_pool *ndis_mtxpool;
+
+SYSCTL_STRING(_hw, OID_AUTO, ndis_filepath, CTLFLAG_RW, ndis_filepath,
+        MAXPATHLEN, "Path used by NdisOpenFile() to search for files");
 
 __stdcall static void ndis_initwrap(ndis_handle,
 	ndis_driver_object *, void *, void *);
@@ -255,6 +263,10 @@
         void *, uint32_t);
 static void ndis_workfunc(void *, int);
 __stdcall static ndis_status ndis_sched_workitem(ndis_work_item *);
+__stdcall static void ndis_pkt_to_pkt(ndis_packet *, uint32_t, uint32_t,
+	ndis_packet *, uint32_t, uint32_t *);
+__stdcall static void ndis_pkt_to_pkt_safe(ndis_packet *, uint32_t, uint32_t,
+	ndis_packet *, uint32_t, uint32_t *, uint32_t);
 __stdcall static void dummy(void);
 
 /*
@@ -270,16 +282,17 @@
 int
 ndis_libinit()
 {
-	mtx_init(&ndis_interlock, "ndislock", MTX_NETWORK_LOCK,
-	    MTX_DEF | MTX_RECURSE | MTX_DUPOK);
-
+	strcpy(ndis_filepath, "/compat/ndis");
+	ndis_mtxpool = mtx_pool_create("ndis mutex pool",
+	    1024, MTX_DEF | MTX_RECURSE | MTX_DUPOK);;
+	ndis_interlock = mtx_pool_alloc(ndis_mtxpool);
 	return(0);
 }
 
 int
 ndis_libfini()
 {
-	mtx_destroy(&ndis_interlock);
+	mtx_pool_destroy(&ndis_mtxpool);
 	return(0);
 }
 
@@ -669,15 +682,7 @@
 ndis_create_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	struct mtx		*mtx;
-
-	mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (mtx == NULL)
-		return;
-	mtx_init(mtx, "ndislock", "ndis spin lock",
-	    MTX_DEF | MTX_RECURSE | MTX_DUPOK);
-	lock->nsl_spinlock = (ndis_kspin_lock)mtx;
-
+	lock->nsl_spinlock = (ndis_kspin_lock)mtx_pool_alloc(ndis_mtxpool);
 	return;
 }
 
@@ -685,13 +690,7 @@
 ndis_destroy_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	struct mtx		*ndis_mtx;
-
-	ndis_mtx = (struct mtx *)lock->nsl_spinlock;
-	mtx_destroy(ndis_mtx);
-	free(ndis_mtx, M_DEVBUF);
-	lock->nsl_spinlock = 0xdeadf00d; /* XXX */
-
+	/* We use a mutex pool, so this is a no-op. */
 	return;
 }
 
@@ -699,32 +698,7 @@
 ndis_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	if (lock == NULL)
-		return;
-	/*
-	 * Workaround for certain broken NDIS drivers. I have
-	 * encountered one case where a driver creates a spinlock
-	 * within its DriverEntry() routine, which is then destroyed
-	 * in its MiniportHalt() routine. This is a bug, because
-	 * MiniportHalt() is meant to only destroy what MiniportInit()
-	 * creates. This leads to the following problem:
-	 *     DriverEntry() <- spinlock created
-	 *     MiniportInit() <- NIC initialized
-	 *     MiniportHalt() <- NIC halted, spinlock destroyed
-	 *     MiniportInit() <- NIC initialized, spinlock not recreated
-	 *     NdisAcquireSpinLock(boguslock) <- panic
-	 * To work around this, we poison the spinlock on destroy, and
-	 * if we try to re-acquire the poison pill^Wspinlock, we init
-	 * it again so subsequent calls will work.
-	 *
-	 * Drivers that behave in this way are likely not officially
-	 * certified by Microsoft, since their I would expect the
-	 * Microsoft NDIS test tool to catch mistakes like this.
-	 */
-	if (lock->nsl_spinlock == 0xdeadf00d)
-		ndis_create_lock(lock);
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
-
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	return;
 }
 
@@ -732,10 +706,7 @@
 ndis_unlock(lock)
 	ndis_spin_lock		*lock;
 {
-	if (lock == NULL)
-		return;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
-
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	return;
 }
 
@@ -1101,7 +1072,8 @@
 	if (sc->ndis_res_io == NULL)
 		return(NDIS_STATUS_FAILURE);
 
-	if (rman_get_size(sc->ndis_res_io) != numports)
+	/* Don't let the device map more ports than we have. */
+	if (rman_get_size(sc->ndis_res_io) < numports)
 		return(NDIS_STATUS_INVALID_LENGTH);
 
 	*offset = (void *)rman_get_start(sc->ndis_res_io);
@@ -1539,6 +1511,13 @@
 	pkt->np_private.npp_packetooboffset =
 	    offsetof(ndis_packet, np_oob);
 
+	/*
+	 * We must initialize the packet flags correctly in order
+	 * for the NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO() and
+	 * NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO() to work correctly.
+	 */
+	pkt->np_private.npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
+
 	*packet = pkt;
 
 	head->np_private.npp_count++;
@@ -2086,13 +2065,13 @@
 {
 	ndis_list_entry		*flink;
 
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	flink = head->nle_flink;
 	entry->nle_flink = flink;
 	entry->nle_blink = head;
 	flink->nle_blink = entry;
 	head->nle_flink = entry;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(flink);
 }
@@ -2105,12 +2084,12 @@
 	ndis_list_entry		*flink;
 	ndis_list_entry		*entry;
 
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	entry = head->nle_flink;
 	flink = entry->nle_flink;
 	head->nle_flink = flink;
 	flink->nle_blink = head;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(entry);
 }
@@ -2123,13 +2102,13 @@
 {
 	ndis_list_entry		*blink;
 
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	blink = head->nle_blink;
 	entry->nle_flink = head;
 	entry->nle_blink = blink;
 	blink->nle_flink = entry;
 	head->nle_blink = entry;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(blink);
 }
@@ -2149,9 +2128,9 @@
 
 	sc = (struct ndis_softc *)intr->ni_block->nmb_ifp;
 	sync = syncfunc;
-	mtx_lock(&sc->ndis_intrmtx);
+	mtx_pool_lock(ndis_mtxpool, sc->ndis_intrmtx);
 	rval = sync(syncctx);
-	mtx_unlock(&sc->ndis_intrmtx);
+	mtx_pool_unlock(ndis_mtxpool, sc->ndis_intrmtx);
 
 	return(rval);
 }
@@ -2323,12 +2302,50 @@
 	ndis_physaddr		highestaddr;
 {
 	char			*afilename = NULL;
+	struct thread		*td = curthread;
+	struct nameidata	nd;
+	int			flags, error;
+	struct vattr		vat;
+	struct vattr		*vap = &vat;
+	ndis_fh			*fh;
+	char			path[MAXPATHLEN];
 
-	ndis_unicode_to_ascii(filename->nus_buf, filename->nus_len, &afilename);
-	printf("ndis_open_file(\"%s\", %ju)\n", afilename,
-	    highestaddr.np_quad);
+	ndis_unicode_to_ascii(filename->nus_buf,
+	    filename->nus_len, &afilename);
+
+	sprintf(path, "%s/%s", ndis_filepath, afilename);
 	free(afilename, M_DEVBUF);
-	*status = NDIS_STATUS_FILE_NOT_FOUND;
+
+	fh = malloc(sizeof(ndis_fh), M_TEMP, M_NOWAIT);
+	if (fh == NULL) {
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+
+	mtx_lock(&Giant);
+	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td);
+
+	flags = FREAD;
+	error = vn_open(&nd, &flags, 0, -1);
+	if (error) {
+		mtx_unlock(&Giant);
+		*status = NDIS_STATUS_FILE_NOT_FOUND;
+		free(fh, M_TEMP);
+		return;
+	}
+
+	NDFREE(&nd, NDF_ONLY_PNBUF);
+
+	/* Get the file size. */
+	VOP_GETATTR(nd.ni_vp, vap, NOCRED, td);
+	VOP_UNLOCK(nd.ni_vp, 0, td);
+	mtx_unlock(&Giant);
+
+	fh->nf_vp = nd.ni_vp;
+	fh->nf_map = NULL;
+	*filehandle = fh;
+	*filelength = fh->nf_maplen = vap->va_size & 0xFFFFFFFF;
+	*status = NDIS_STATUS_SUCCESS;
 	return;
 }
 
@@ -2338,8 +2355,46 @@
 	void			**mappedbuffer;
 	ndis_handle		filehandle;
 {
+	ndis_fh			*fh;
+	struct thread		*td = curthread;
+	int			error, resid;
+
+	if (filehandle == NULL) {
+		*status = NDIS_STATUS_FAILURE;
+		return;
+	}
+
+	fh = (ndis_fh *)filehandle;
+
+	if (fh->nf_vp == NULL) {
+		*status = NDIS_STATUS_FAILURE;
+		return;
+	}
 
-	*status = NDIS_STATUS_ALREADY_MAPPED;
+	if (fh->nf_map != NULL) {
+		*status = NDIS_STATUS_ALREADY_MAPPED;
+		return;
+	}
+
+	fh->nf_map = malloc(fh->nf_maplen, M_DEVBUF, M_NOWAIT);
+
+	if (fh->nf_map == NULL) {
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+
+	mtx_lock(&Giant);
+	error = vn_rdwr(UIO_READ, fh->nf_vp, fh->nf_map, fh->nf_maplen, 0,
+	    UIO_SYSSPACE, 0, td->td_ucred, NOCRED, &resid, td);
+	mtx_unlock(&Giant);
+
+	if (error)
+		*status = NDIS_STATUS_FAILURE;
+	else {
+		*status = NDIS_STATUS_SUCCESS;
+		*mappedbuffer = fh->nf_map;
+	}
+
 	return;
 }
 
@@ -2347,6 +2402,14 @@
 ndis_unmap_file(filehandle)
 	ndis_handle		filehandle;
 {
+	ndis_fh			*fh;
+	fh = (ndis_fh *)filehandle;
+
+	if (fh->nf_map == NULL)
+		return;
+	free(fh->nf_map, M_DEVBUF);
+	fh->nf_map = NULL;
+
 	return;
 }
 
@@ -2354,18 +2417,36 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 08:45:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC7B716A4D0; Thu, 15 Jan 2004 08:45:05 -0800 (PST)
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 83D4616A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:45:05 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 97BE543D5F
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:44:58 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FGiw0B003904
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:44:58 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FGioeO003901
	for perforce@freebsd.org; Thu, 15 Jan 2004 08:44:50 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Thu, 15 Jan 2004 08:44:50 -0800 (PST)
Message-Id: <200401151644.i0FGioeO003901@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45394 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: Thu, 15 Jan 2004 16:45:06 -0000

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

Change 45394 by sam@sam_ebb on 2004/01/15 08:43:54

	IFC

Affected files ...

.. //depot/projects/netperf+sockets/sys/alpha/include/sysarch.h#2 integrate
.. //depot/projects/netperf+sockets/sys/amd64/include/sysarch.h#2 integrate
.. //depot/projects/netperf+sockets/sys/boot/forth/beastie.4th#4 integrate
.. //depot/projects/netperf+sockets/sys/boot/i386/cdboot/cdboot.s#3 integrate
.. //depot/projects/netperf+sockets/sys/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/netperf+sockets/sys/compat/linux/linux_util.c#2 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#11 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#9 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/pe_var.h#3 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#11 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#8 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/subr_pe.c#6 integrate
.. //depot/projects/netperf+sockets/sys/conf/files#6 integrate
.. //depot/projects/netperf+sockets/sys/conf/files.alpha#2 integrate
.. //depot/projects/netperf+sockets/sys/conf/files.i386#4 integrate
.. //depot/projects/netperf+sockets/sys/conf/files.ia64#4 integrate
.. //depot/projects/netperf+sockets/sys/conf/files.pc98#3 integrate
.. //depot/projects/netperf+sockets/sys/conf/files.powerpc#2 integrate
.. //depot/projects/netperf+sockets/sys/conf/files.sparc64#3 integrate
.. //depot/projects/netperf+sockets/sys/conf/kern.post.mk#5 integrate
.. //depot/projects/netperf+sockets/sys/conf/majors#4 integrate
.. //depot/projects/netperf+sockets/sys/conf/newvers.sh#3 integrate
.. //depot/projects/netperf+sockets/sys/conf/options.i386#5 integrate
.. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/exstore.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/acpica/Osd/OsdTable.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#8 integrate
.. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_thermal.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/acpica/acpivar.h#5 integrate
.. //depot/projects/netperf+sockets/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-card.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-dma.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-isa.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-lowlevel.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/atapi-cam.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/awi/am79c930.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/awi/am79c930reg.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/awi/am79c930var.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/awi/awi.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/awi/awi_wep.c#2 delete
.. //depot/projects/netperf+sockets/sys/dev/awi/awi_wicfg.c#2 delete
.. //depot/projects/netperf+sockets/sys/dev/awi/awireg.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/awi/awivar.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/awi/if_awi_pccard.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/firewire/firewire.c#5 integrate
.. //depot/projects/netperf+sockets/sys/dev/firewire/fwohci.c#5 integrate
.. //depot/projects/netperf+sockets/sys/dev/firewire/if_fwe.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/firewire/sbp.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/ida/ida.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ida/ida_disk.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ida/ida_eisa.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ida/ida_pci.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ida/idaio.h#1 branch
.. //depot/projects/netperf+sockets/sys/dev/ida/idareg.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ida/idavar.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/idt/idt.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndisvar.h#5 integrate
.. //depot/projects/netperf+sockets/sys/dev/ispfw/asm_12160.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ispfw/asm_2200.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/ispfw/asm_2300.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/md/md.c#4 integrate
.. //depot/projects/netperf+sockets/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/pdq/pdqvar.h#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/uhci.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/uhci_pci.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usb_quirks.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#7 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#7 integrate
.. //depot/projects/netperf+sockets/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/netperf+sockets/sys/fs/smbfs/smbfs_smb.c#2 integrate
.. //depot/projects/netperf+sockets/sys/fs/smbfs/smbfs_vnops.c#3 integrate
.. //depot/projects/netperf+sockets/sys/geom/geom_subr.c#3 integrate
.. //depot/projects/netperf+sockets/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate
.. //depot/projects/netperf+sockets/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/netperf+sockets/sys/gnu/dev/sound/pci/emu10k1.h#2 integrate
.. //depot/projects/netperf+sockets/sys/i386/acpica/acpi_toshiba.c#1 branch
.. //depot/projects/netperf+sockets/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/netperf+sockets/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/netperf+sockets/sys/i386/include/sysarch.h#2 integrate
.. //depot/projects/netperf+sockets/sys/ia64/include/cpufunc.h#3 integrate
.. //depot/projects/netperf+sockets/sys/ia64/include/sysarch.h#4 integrate
.. //depot/projects/netperf+sockets/sys/kern/init_main.c#2 integrate
.. //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/netperf+sockets/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/netperf+sockets/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/netperf+sockets/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/netperf+sockets/sys/kern/kern_thread.c#5 integrate
.. //depot/projects/netperf+sockets/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/netperf+sockets/sys/kern/tty.c#3 integrate
.. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/netperf+sockets/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/netperf+sockets/sys/libkern/ffs.c#2 integrate
.. //depot/projects/netperf+sockets/sys/libkern/ffsl.c#1 branch
.. //depot/projects/netperf+sockets/sys/libkern/fls.c#1 branch
.. //depot/projects/netperf+sockets/sys/libkern/flsl.c#1 branch
.. //depot/projects/netperf+sockets/sys/modules/Makefile#5 integrate
.. //depot/projects/netperf+sockets/sys/modules/acpi/Makefile#4 integrate
.. //depot/projects/netperf+sockets/sys/modules/acpi/Makefile.inc#1 branch
.. //depot/projects/netperf+sockets/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/netperf+sockets/sys/modules/acpi/acpi_toshiba/Makefile#1 branch
.. //depot/projects/netperf+sockets/sys/modules/awi/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/cx/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/drm/mga/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/drm/r128/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/drm/radeon/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/drm/sis/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/drm/tdfx/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/ida/Makefile#1 branch
.. //depot/projects/netperf+sockets/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/hci/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/l2cap/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/netgraph/fec/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/sound/driver/emu10k1/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/ubsa/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/ucom/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/udf/Makefile#3 integrate
.. //depot/projects/netperf+sockets/sys/modules/ufm/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/uftdi/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/umct/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/uplcom/Makefile#3 integrate
.. //depot/projects/netperf+sockets/sys/modules/uvisor/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/modules/uvscom/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/net/if_atmsubr.c#3 integrate
.. //depot/projects/netperf+sockets/sys/net/if_media.h#3 integrate
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#5 integrate
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#7 integrate
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#4 integrate
.. //depot/projects/netperf+sockets/sys/netgraph/ng_ether.c#4 integrate
.. //depot/projects/netperf+sockets/sys/netgraph/ng_rfc1490.c#2 integrate
.. //depot/projects/netperf+sockets/sys/netgraph/ng_rfc1490.h#3 integrate
.. //depot/projects/netperf+sockets/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/netperf+sockets/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/netperf+sockets/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/netperf+sockets/sys/netinet/tcp.h#2 integrate
.. //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#5 integrate
.. //depot/projects/netperf+sockets/sys/netinet/tcp_var.h#4 integrate
.. //depot/projects/netperf+sockets/sys/netinet6/in6.c#3 integrate
.. //depot/projects/netperf+sockets/sys/netinet6/in6_ifattach.c#3 integrate
.. //depot/projects/netperf+sockets/sys/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/netperf+sockets/sys/netinet6/ipsec.c#3 integrate
.. //depot/projects/netperf+sockets/sys/netkey/key.c#4 integrate
.. //depot/projects/netperf+sockets/sys/pc98/conf/NOTES#5 integrate
.. //depot/projects/netperf+sockets/sys/pc98/i386/machdep.c#4 integrate
.. //depot/projects/netperf+sockets/sys/pci/if_dc.c#3 integrate
.. //depot/projects/netperf+sockets/sys/pci/if_dcreg.h#3 integrate
.. //depot/projects/netperf+sockets/sys/pci/ncr.c#2 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/include/nexusvar.h#2 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/powermac/ata_macio.c#3 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/powermac/openpic_macio.c#1 branch
.. //depot/projects/netperf+sockets/sys/powerpc/powerpc/nexus.c#2 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/psim/ata_iobus.c#2 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/psim/openpic_iobus.c#1 branch
.. //depot/projects/netperf+sockets/sys/rpc/rpcclnt.c#3 integrate
.. //depot/projects/netperf+sockets/sys/sparc64/include/ofw_machdep.h#2 integrate
.. //depot/projects/netperf+sockets/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/netperf+sockets/sys/sparc64/sparc64/ofw_machdep.c#3 integrate
.. //depot/projects/netperf+sockets/sys/sys/filedesc.h#3 integrate
.. //depot/projects/netperf+sockets/sys/sys/libkern.h#2 integrate
.. //depot/projects/netperf+sockets/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/netperf+sockets/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/netperf+sockets/sys/vm/vm_kern.c#6 integrate
.. //depot/projects/netperf+sockets/sys/vm/vm_page.c#5 integrate

Differences ...

==== //depot/projects/netperf+sockets/sys/alpha/include/sysarch.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.6 2002/03/20 18:58:45 obrien Exp $
+ * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.7 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -52,6 +52,7 @@
 
 __BEGIN_DECLS
 int		alpha_sethae(u_int64_t);
+int		sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/netperf+sockets/sys/amd64/include/sysarch.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.21 2003/10/23 06:06:14 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.22 2004/01/09 16:52:08 nectar Exp $
  */
 
 /*
@@ -50,9 +50,10 @@
 
 __BEGIN_DECLS
 int amd64_get_fsbase(void **);
+int amd64_get_gsbase(void **);
 int amd64_set_fsbase(void *);
-int amd64_get_gsbase(void **);
 int amd64_set_gsbase(void *);
+int sysarch(int, void *);
 __END_DECLS
 #endif
 

==== //depot/projects/netperf+sockets/sys/boot/forth/beastie.4th#4 (text+ko) ====

@@ -23,7 +23,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.7 2003/10/28 17:18:42 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $
 
 marker task-beastie.4th
 
@@ -228,6 +228,7 @@
 				s" acpi_load" unsetenv
 				s" 1" s" hint.acpi.0.disabled" setenv
 				s" 1" s" loader.acpi_disabled_by_user" setenv
+				s" 1" s" hint.apic.0.disabled" setenv
 			then
 			s" 0" s" hw.ata.ata_dma" setenv
 			s" 0" s" hw.ata.atapi_dma" setenv

==== //depot/projects/netperf+sockets/sys/boot/i386/cdboot/cdboot.s#3 (text+ko) ====

@@ -13,7 +13,7 @@
 # purpose.
 #
 
-# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.10 2003/12/11 22:42:50 jhb Exp $
+# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.11 2004/01/12 20:34:42 jhb Exp $
 
 #
 # This program is a freestanding boot program to load an a.out binary
@@ -165,7 +165,7 @@
 #
 		mov DIR_SIZE(%bx),%eax		# Read file length
 		add $SECTOR_SIZE-1,%eax		# Convert length to sectors
-		shr $11,%eax
+		shr $SECTOR_SHIFT,%eax
 		cmp $BUFFER_LEN,%eax
 		jbe load_sizeok
 		mov $msg_load2big,%si		# Error message
@@ -400,6 +400,7 @@
 # Trashes: EAX
 #
 read:		push %si			# Save
+		push %cx			# Save since some BIOSs trash
 		mov %eax,edd_lba		# LBA to read from
 		mov %ebx,%eax			# Convert address
 		shr $4,%eax			#  to segment
@@ -413,7 +414,8 @@
 		int $0x13			# Call BIOS
 		pop %dx				# Restore
 		jc read.fail			# Worked?
-		pop %si				# Restore
+		pop %cx				# Restore
+		pop %si
 		ret				# Return
 read.fail:	cmp $ERROR_TIMEOUT,%ah		# Timeout?
 		je read.retry			# Yes, Retry.
@@ -460,6 +462,7 @@
 		mov twiddle_chars,%bx		# Address table
 		inc %al				# Next
 		and $3,%al			#  char
+		mov %al,twiddle_index		# Save index for next call
 		xlat				# Get char
 		call putc			# Output it
 		mov $8,%al			# Backspace

==== //depot/projects/netperf+sockets/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.80 2004/01/02 19:29:31 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.81 2004/01/12 03:14:37 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -352,7 +352,7 @@
 	/* resolve symlinks etc. in the emulation tree prefix */
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
-	if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) == -1)
+	if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) != 0)
 		lep = linux_emul_path;
 	else
 		lep = dlep;

==== //depot/projects/netperf+sockets/sys/compat/linux/linux_util.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.23 2003/06/10 21:27:40 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.24 2004/01/14 22:38:03 truckman Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,8 +96,6 @@
 {
 	struct nameidata	 nd;
 	struct nameidata	 ndroot;
-	struct vattr		 vat;
-	struct vattr		 vatroot;
 	int			 error;
 	const char		*prefix;
 	char			*ptr, *buf, *cp;
@@ -169,17 +167,7 @@
 			goto keeporig;
 		}
 
-		if ((error = VOP_GETATTR(nd.ni_vp, &vat, td->td_ucred, td)) != 0) {
-			goto bad;
-		}
-
-		if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, td->td_ucred, td))
-		    != 0) {
-			goto bad;
-		}
-
-		if (vat.va_fsid == vatroot.va_fsid &&
-		    vat.va_fileid == vatroot.va_fileid) {
+		if (nd.ni_vp == ndroot.ni_vp) {
 			error = ENOENT;
 			goto bad;
 		}

==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.23 2004/01/07 06:15:56 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.29 2004/01/13 22:49:45 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -75,7 +75,6 @@
 #include <compat/ndis/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
-#define __stdcall __attribute__((__stdcall__))
 #define NDIS_DUMMY_PATH "\\\\some\\bogus\\path"
 
 __stdcall static void ndis_status_func(ndis_handle, ndis_status,
@@ -151,7 +150,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 
-	device_printf (block->nmb_dev, "status: %x\n", status);
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "status: %x\n", status);
 	return;
 }
 
@@ -162,7 +162,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 	
-	device_printf (block->nmb_dev, "status complete\n");
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "status complete\n");
 	return;
 }
 
@@ -201,7 +202,8 @@
 	ndis_miniport_block	*block;
 	block = adapter;
 
-	device_printf (block->nmb_dev, "reset done...\n");
+	if (block->nmb_ifp->if_flags & IFF_DEBUG)
+		device_printf (block->nmb_dev, "reset done...\n");
 	return;
 }
 
@@ -305,17 +307,17 @@
 	    "NDIS API Version", "0x00050001", CTLFLAG_RD);
 
 	/* Bus type (PCI, PCMCIA, etc...) */
-	sprintf(buf, "%d\n", (int)sc->ndis_iftype);
+	sprintf(buf, "%d", (int)sc->ndis_iftype);
 	ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
 
 	if (sc->ndis_res_io != NULL) {
-		sprintf(buf, "0x%lx\n", rman_get_start(sc->ndis_res_io));
+		sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
 		ndis_add_sysctl(sc, "IOBaseAddress",
 		    "Base I/O Address", buf, CTLFLAG_RD);
 	}
 
 	if (sc->ndis_irq != NULL) {
-		sprintf(buf, "%lu\n", rman_get_start(sc->ndis_irq));
+		sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
 		ndis_add_sysctl(sc, "InterruptNumber",
 		    "Interrupt Number", buf, CTLFLAG_RD);
 	}
@@ -600,6 +602,7 @@
 	priv = &(*p)->np_private;
 	priv->npp_totlen = m0->m_pkthdr.len;
         priv->npp_packetooboffset = offsetof(ndis_packet, np_oob);
+	priv->npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
 
 	for (m = m0; m != NULL; m = m->m_next) {
 		if (m->m_len == 0)
@@ -1080,6 +1083,8 @@
 	return(0);
 }
 
+#define NDIS_LOADED		0x42534F44
+
 int
 ndis_load_driver(img, arg)
 	vm_offset_t		img;
@@ -1098,22 +1103,34 @@
 
 	sc = arg;
 
-	/* Perform text relocation */
-	if (pe_relocate(img))
-		return(ENOEXEC);
+	/*
+	 * Only perform the relocation/linking phase once
+	 * since the binary image may be shared among multiple
+	 * device instances.
+	 */
 
-        /* Dynamically link the NDIS.SYS routines -- required. */
-	if (pe_patch_imports(img, "NDIS", ndis_functbl))
-		return(ENOEXEC);
+	ptr = (uint32_t *)(img + 8);
+	if (*ptr != NDIS_LOADED) {
+		/* Perform text relocation */
+		if (pe_relocate(img))
+			return(ENOEXEC);
 
-	/* Dynamically link the HAL.dll routines -- also required. */
-	if (pe_patch_imports(img, "HAL", hal_functbl))
-		return(ENOEXEC);
+		/* Dynamically link the NDIS.SYS routines -- required. */
+		if (pe_patch_imports(img, "NDIS", ndis_functbl))
+			return(ENOEXEC);
 
-	/* Dynamically link ntoskrnl.exe -- optional. */
-	if (pe_get_import_descriptor(img, &imp_desc, "ntoskrnl") == 0) {
-		if (pe_patch_imports(img, "ntoskrnl", ntoskrnl_functbl))
+		/* Dynamically link the HAL.dll routines -- also required. */
+		if (pe_patch_imports(img, "HAL", hal_functbl))
 			return(ENOEXEC);
+
+		/* Dynamically link ntoskrnl.exe -- optional. */
+		if (pe_get_import_descriptor(img,
+		    &imp_desc, "ntoskrnl") == 0) {
+			if (pe_patch_imports(img,
+			    "ntoskrnl", ntoskrnl_functbl))
+				return(ENOEXEC);
+		}
+		*ptr = NDIS_LOADED;
 	}
 
         /* Locate the driver entry point */

==== //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#9 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.12 2004/01/06 07:09:26 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.15 2004/01/12 03:49:20 wpaul Exp $
  */
 
 #ifndef _NDIS_VAR_H_
@@ -443,7 +443,7 @@
 
 struct ndis_80211_bssid_list_ex {
 	uint32_t		nblx_items;
-	ndis_wlan_bssid		nblx_bssid[1];
+	ndis_wlan_bssid_ex	nblx_bssid[1];
 };
 
 typedef struct ndis_80211_bssid_list_ex ndis_80211_bssid_list_ex;
@@ -808,7 +808,7 @@
  */
 struct ndis_miniport_interrupt {
 	void			*ni_introbj;
-	ndis_spin_lock		ni_dpccountlock;
+	ndis_kspin_lock		ni_dpccountlock;
 	void			*ni_rsvd;
 	void			*ni_isrfunc;
 	void			*ni_dpcfunc;
@@ -919,6 +919,10 @@
 #define NDIS_FLAGS_SENT_AT_DPC                  0x00001000
 #define NDIS_FLAGS_USES_SG_BUFFER_LIST          0x00002000
 
+#define NDIS_PACKET_WRAPPER_RESERVED			0x3F
+#define NDIS_PACKET_CONTAINS_MEDIA_SPECIFIC_INFO	0x40
+#define NDIS_PACKET_ALLOCATED_BY_NDIS			0x80
+
 #define NDIS_PROTOCOL_ID_DEFAULT        0x00
 #define NDIS_PROTOCOL_ID_TCP_IP         0x02
 #define NDIS_PROTOCOL_ID_IPX            0x06
@@ -1157,6 +1161,14 @@
 
 TAILQ_HEAD(nte_head, ndis_timer_entry);
 
+struct ndis_fh {
+	void			*nf_vp;
+	void			*nf_map;
+	uint32_t		nf_maplen; 
+};
+
+typedef struct ndis_fh ndis_fh;
+
 /*
  * The miniport block is basically the internal NDIS handle. We need
  * to define this because, unfortunately, it is not entirely opaque

==== //depot/projects/netperf+sockets/sys/compat/ndis/pe_var.h#3 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.3 2004/01/06 18:06:54 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.4 2004/01/13 22:49:45 obrien Exp $
  */
 
 #ifndef _PE_VAR_H_
@@ -408,6 +408,20 @@
 
 typedef struct image_patch_table image_patch_table;
 
+/*
+ * Note: Windows uses the _stdcall calling convention. This means
+ * that the callback functions provided in the function table must
+ * be declared using __attribute__((__stdcall__)), otherwise the
+ * Windows code will likely screw up the %esp register and cause
+ * us to jump to an invalid address when it returns.
+ */
+
+#ifdef __amd64__
+#define __stdcall
+#else
+#define __stdcall __attribute__((__stdcall__))
+#endif
+
 __BEGIN_DECLS
 extern int pe_get_dos_header(vm_offset_t, image_dos_header *);
 extern int pe_is_nt_image(vm_offset_t);

==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_hal.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.3 2004/01/03 09:20:48 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.6 2004/01/13 22:49:45 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -55,7 +55,6 @@
 #include <compat/ndis/hal_var.h>
 #include <compat/ndis/ntoskrnl_var.h>
 
-#define __stdcall __attribute__((__stdcall__))
 #define FUNC void(*)(void)
 
 __stdcall static void hal_stall_exec_cpu(uint32_t);
@@ -82,6 +81,8 @@
 __stdcall static uint8_t hal_irql(void);
 __stdcall static void dummy (void);
 
+extern struct mtx_pool *ndis_mtxpool;
+
 __stdcall static void
 hal_stall_exec_cpu(usecs)
 	uint32_t		usecs;
@@ -211,7 +212,7 @@
 
 	__asm__ __volatile__ ("" : "=c" (lock));
 
-	mtx_lock((struct mtx *)*lock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)*lock);
 	return(0);
 }
 
@@ -223,7 +224,7 @@
 
 	__asm__ __volatile__ ("" : "=c" (lock), "=d" (newiqrl));
 
-	mtx_unlock((struct mtx *)*lock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)*lock);
 	return;
 }
 

==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.30 2004/01/07 19:26:47 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.37 2004/01/15 07:42:26 wpaul Exp $");
 
 /*
  * This file implements a translation layer between the BSD networking
@@ -65,6 +65,10 @@
 #include <sys/smp.h>
 #include <sys/queue.h>
 #include <sys/taskqueue.h>
+#include <sys/proc.h>
+#include <sys/namei.h>
+#include <sys/fcntl.h>
+#include <sys/vnode.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -96,10 +100,14 @@
 #include <compat/ndis/cfg_var.h>
 #include <dev/if_ndis/if_ndisvar.h>
 
-#define __stdcall __attribute__((__stdcall__))
 #define FUNC void(*)(void)
 
-static struct mtx ndis_interlock;
+static struct mtx *ndis_interlock;
+static char ndis_filepath[MAXPATHLEN];
+struct mtx_pool *ndis_mtxpool;
+
+SYSCTL_STRING(_hw, OID_AUTO, ndis_filepath, CTLFLAG_RW, ndis_filepath,
+        MAXPATHLEN, "Path used by NdisOpenFile() to search for files");
 
 __stdcall static void ndis_initwrap(ndis_handle,
 	ndis_driver_object *, void *, void *);
@@ -255,6 +263,10 @@
         void *, uint32_t);
 static void ndis_workfunc(void *, int);
 __stdcall static ndis_status ndis_sched_workitem(ndis_work_item *);
+__stdcall static void ndis_pkt_to_pkt(ndis_packet *, uint32_t, uint32_t,
+	ndis_packet *, uint32_t, uint32_t *);
+__stdcall static void ndis_pkt_to_pkt_safe(ndis_packet *, uint32_t, uint32_t,
+	ndis_packet *, uint32_t, uint32_t *, uint32_t);
 __stdcall static void dummy(void);
 
 /*
@@ -270,16 +282,17 @@
 int
 ndis_libinit()
 {
-	mtx_init(&ndis_interlock, "ndislock", MTX_NETWORK_LOCK,
-	    MTX_DEF | MTX_RECURSE | MTX_DUPOK);
-
+	strcpy(ndis_filepath, "/compat/ndis");
+	ndis_mtxpool = mtx_pool_create("ndis mutex pool",
+	    1024, MTX_DEF | MTX_RECURSE | MTX_DUPOK);;
+	ndis_interlock = mtx_pool_alloc(ndis_mtxpool);
 	return(0);
 }
 
 int
 ndis_libfini()
 {
-	mtx_destroy(&ndis_interlock);
+	mtx_pool_destroy(&ndis_mtxpool);
 	return(0);
 }
 
@@ -669,15 +682,7 @@
 ndis_create_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	struct mtx		*mtx;
-
-	mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (mtx == NULL)
-		return;
-	mtx_init(mtx, "ndislock", "ndis spin lock",
-	    MTX_DEF | MTX_RECURSE | MTX_DUPOK);
-	lock->nsl_spinlock = (ndis_kspin_lock)mtx;
-
+	lock->nsl_spinlock = (ndis_kspin_lock)mtx_pool_alloc(ndis_mtxpool);
 	return;
 }
 
@@ -685,13 +690,7 @@
 ndis_destroy_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	struct mtx		*ndis_mtx;
-
-	ndis_mtx = (struct mtx *)lock->nsl_spinlock;
-	mtx_destroy(ndis_mtx);
-	free(ndis_mtx, M_DEVBUF);
-	lock->nsl_spinlock = 0xdeadf00d; /* XXX */
-
+	/* We use a mutex pool, so this is a no-op. */
 	return;
 }
 
@@ -699,32 +698,7 @@
 ndis_lock(lock)
 	ndis_spin_lock		*lock;
 {
-	if (lock == NULL)
-		return;
-	/*
-	 * Workaround for certain broken NDIS drivers. I have
-	 * encountered one case where a driver creates a spinlock
-	 * within its DriverEntry() routine, which is then destroyed
-	 * in its MiniportHalt() routine. This is a bug, because
-	 * MiniportHalt() is meant to only destroy what MiniportInit()
-	 * creates. This leads to the following problem:
-	 *     DriverEntry() <- spinlock created
-	 *     MiniportInit() <- NIC initialized
-	 *     MiniportHalt() <- NIC halted, spinlock destroyed
-	 *     MiniportInit() <- NIC initialized, spinlock not recreated
-	 *     NdisAcquireSpinLock(boguslock) <- panic
-	 * To work around this, we poison the spinlock on destroy, and
-	 * if we try to re-acquire the poison pill^Wspinlock, we init
-	 * it again so subsequent calls will work.
-	 *
-	 * Drivers that behave in this way are likely not officially
-	 * certified by Microsoft, since their I would expect the
-	 * Microsoft NDIS test tool to catch mistakes like this.
-	 */
-	if (lock->nsl_spinlock == 0xdeadf00d)
-		ndis_create_lock(lock);
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
-
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	return;
 }
 
@@ -732,10 +706,7 @@
 ndis_unlock(lock)
 	ndis_spin_lock		*lock;
 {
-	if (lock == NULL)
-		return;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
-
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	return;
 }
 
@@ -1101,7 +1072,8 @@
 	if (sc->ndis_res_io == NULL)
 		return(NDIS_STATUS_FAILURE);
 
-	if (rman_get_size(sc->ndis_res_io) != numports)
+	/* Don't let the device map more ports than we have. */
+	if (rman_get_size(sc->ndis_res_io) < numports)
 		return(NDIS_STATUS_INVALID_LENGTH);
 
 	*offset = (void *)rman_get_start(sc->ndis_res_io);
@@ -1539,6 +1511,13 @@
 	pkt->np_private.npp_packetooboffset =
 	    offsetof(ndis_packet, np_oob);
 
+	/*
+	 * We must initialize the packet flags correctly in order
+	 * for the NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO() and
+	 * NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO() to work correctly.
+	 */
+	pkt->np_private.npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
+
 	*packet = pkt;
 
 	head->np_private.npp_count++;
@@ -2086,13 +2065,13 @@
 {
 	ndis_list_entry		*flink;
 
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	flink = head->nle_flink;
 	entry->nle_flink = flink;
 	entry->nle_blink = head;
 	flink->nle_blink = entry;
 	head->nle_flink = entry;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(flink);
 }
@@ -2105,12 +2084,12 @@
 	ndis_list_entry		*flink;
 	ndis_list_entry		*entry;
 
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	entry = head->nle_flink;
 	flink = entry->nle_flink;
 	head->nle_flink = flink;
 	flink->nle_blink = head;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(entry);
 }
@@ -2123,13 +2102,13 @@
 {
 	ndis_list_entry		*blink;
 
-	mtx_lock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_lock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 	blink = head->nle_blink;
 	entry->nle_flink = head;
 	entry->nle_blink = blink;
 	blink->nle_flink = entry;
 	head->nle_blink = entry;
-	mtx_unlock((struct mtx *)lock->nsl_spinlock);
+	mtx_pool_unlock(ndis_mtxpool, (struct mtx *)lock->nsl_spinlock);
 
 	return(blink);
 }
@@ -2149,9 +2128,9 @@
 
 	sc = (struct ndis_softc *)intr->ni_block->nmb_ifp;
 	sync = syncfunc;
-	mtx_lock(&sc->ndis_intrmtx);
+	mtx_pool_lock(ndis_mtxpool, sc->ndis_intrmtx);
 	rval = sync(syncctx);
-	mtx_unlock(&sc->ndis_intrmtx);
+	mtx_pool_unlock(ndis_mtxpool, sc->ndis_intrmtx);
 
 	return(rval);
 }
@@ -2323,12 +2302,50 @@
 	ndis_physaddr		highestaddr;
 {
 	char			*afilename = NULL;
+	struct thread		*td = curthread;
+	struct nameidata	nd;
+	int			flags, error;
+	struct vattr		vat;
+	struct vattr		*vap = &vat;
+	ndis_fh			*fh;
+	char			path[MAXPATHLEN];
 
-	ndis_unicode_to_ascii(filename->nus_buf, filename->nus_len, &afilename);
-	printf("ndis_open_file(\"%s\", %ju)\n", afilename,
-	    highestaddr.np_quad);
+	ndis_unicode_to_ascii(filename->nus_buf,
+	    filename->nus_len, &afilename);
+
+	sprintf(path, "%s/%s", ndis_filepath, afilename);
 	free(afilename, M_DEVBUF);
-	*status = NDIS_STATUS_FILE_NOT_FOUND;
+
+	fh = malloc(sizeof(ndis_fh), M_TEMP, M_NOWAIT);
+	if (fh == NULL) {
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+
+	mtx_lock(&Giant);
+	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td);
+
+	flags = FREAD;
+	error = vn_open(&nd, &flags, 0, -1);
+	if (error) {
+		mtx_unlock(&Giant);
+		*status = NDIS_STATUS_FILE_NOT_FOUND;
+		free(fh, M_TEMP);
+		return;
+	}
+
+	NDFREE(&nd, NDF_ONLY_PNBUF);
+
+	/* Get the file size. */
+	VOP_GETATTR(nd.ni_vp, vap, NOCRED, td);
+	VOP_UNLOCK(nd.ni_vp, 0, td);
+	mtx_unlock(&Giant);
+
+	fh->nf_vp = nd.ni_vp;
+	fh->nf_map = NULL;
+	*filehandle = fh;
+	*filelength = fh->nf_maplen = vap->va_size & 0xFFFFFFFF;
+	*status = NDIS_STATUS_SUCCESS;
 	return;
 }
 
@@ -2338,8 +2355,46 @@
 	void			**mappedbuffer;
 	ndis_handle		filehandle;
 {
+	ndis_fh			*fh;
+	struct thread		*td = curthread;
+	int			error, resid;
+
+	if (filehandle == NULL) {
+		*status = NDIS_STATUS_FAILURE;
+		return;
+	}
+
+	fh = (ndis_fh *)filehandle;
+
+	if (fh->nf_vp == NULL) {
+		*status = NDIS_STATUS_FAILURE;
+		return;
+	}
 
-	*status = NDIS_STATUS_ALREADY_MAPPED;
+	if (fh->nf_map != NULL) {
+		*status = NDIS_STATUS_ALREADY_MAPPED;
+		return;
+	}
+
+	fh->nf_map = malloc(fh->nf_maplen, M_DEVBUF, M_NOWAIT);
+
+	if (fh->nf_map == NULL) {
+		*status = NDIS_STATUS_RESOURCES;
+		return;
+	}
+
+	mtx_lock(&Giant);
+	error = vn_rdwr(UIO_READ, fh->nf_vp, fh->nf_map, fh->nf_maplen, 0,
+	    UIO_SYSSPACE, 0, td->td_ucred, NOCRED, &resid, td);
+	mtx_unlock(&Giant);
+
+	if (error)
+		*status = NDIS_STATUS_FAILURE;
+	else {
+		*status = NDIS_STATUS_SUCCESS;
+		*mappedbuffer = fh->nf_map;
+	}
+
 	return;
 }
 
@@ -2347,6 +2402,14 @@
 ndis_unmap_file(filehandle)
 	ndis_handle		filehandle;
 {
+	ndis_fh			*fh;
+	fh = (ndis_fh *)filehandle;
+
+	if (fh->nf_map == NULL)
+		return;
+	free(fh->nf_map, M_DEVBUF);
+	fh->nf_map = NULL;
+
 	return;
 }
 
@@ -2354,18 +2417,36 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 09:03:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D117616A4D1; Thu, 15 Jan 2004 09:03:22 -0800 (PST)
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 A45A716A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 09:03:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4354D43D39
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 09:03:21 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FH3L0B015170
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 09:03:21 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FH3Kdo015167
	for perforce@freebsd.org; Thu, 15 Jan 2004 09:03:20 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Thu, 15 Jan 2004 09:03:20 -0800 (PST)
Message-Id: <200401151703.i0FH3Kdo015167@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 45395 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: Thu, 15 Jan 2004 17:03:23 -0000

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

Change 45395 by cvance@cvance_sony on 2004/01/15 09:02:59

	Re-add vfs_nmount prototype lost during last integ

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#10 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#10 (text+ko) ====

@@ -111,6 +111,7 @@
 		    struct label *mntlabel, struct mount **mpp);
 static int	vfs_mountroot_ask(void);
 static int	vfs_mountroot_try(char *mountfrom);
+static int	vfs_nmount(struct thread *td, int fsflags, struct uio *fsopts);
 
 static int	usermount = 0;	/* if 1, non-root can mount fs. */
 SYSCTL_INT(_vfs, OID_AUTO, usermount, CTLFLAG_RW, &usermount, 0, "");

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 09:03:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06E5F16A4D2; Thu, 15 Jan 2004 09:03:23 -0800 (PST)
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 BD74016A4CF
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 09:03:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A997443D45
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 09:03:21 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FH3L0B015176
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 09:03:21 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FH3L0h015173
	for perforce@freebsd.org; Thu, 15 Jan 2004 09:03:21 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Thu, 15 Jan 2004 09:03:21 -0800 (PST)
Message-Id: <200401151703.i0FH3L0h015173@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45396 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: Thu, 15 Jan 2004 17:03:23 -0000

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

Change 45396 by sam@sam_ebb on 2004/01/15 09:03:07

	fdalloc api change

Affected files ...

.. //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#7 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#7 (text+ko) ====

@@ -1204,7 +1204,7 @@
 			fdp = (int *)
 			    CMSG_DATA(mtod(*controlp, struct cmsghdr *));
 			for (i = 0; i < newfds; i++) {
-				if (fdalloc(td, 0, &f))
+				if (fdalloc(td, &f))
 					panic("unp_externalize fdalloc failed");
 				fp = *rp++;
 				td->td_proc->p_fd->fd_ofiles[f] = fp;

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 12:54:02 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49C9A16A4D0; Thu, 15 Jan 2004 12:54:02 -0800 (PST)
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 1C45B16A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:54:02 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0B5F143D66
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:54:01 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FKs00B072789
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:54:00 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FKs08i072784
	for perforce@freebsd.org; Thu, 15 Jan 2004 12:54:00 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Thu, 15 Jan 2004 12:54:00 -0800 (PST)
Message-Id: <200401152054.i0FKs08i072784@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 45407 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: Thu, 15 Jan 2004 20:54:02 -0000

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

Change 45407 by cvance@cvance_release on 2004/01/15 12:53:57

	mpo_create_cred was replaced with mpo_copy_cred_label

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#30 edit

Differences ...

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

@@ -510,12 +510,12 @@
 }
 
 static void
-sebsd_create_cred(struct ucred *cred_parent, struct ucred *cred_child)
+sebsd_copy_cred_label(struct label *src, struct label *dest)
 {
 	struct task_security_struct *parent, *task;
 
-	parent = SLOT(cred_parent->cr_label);
-	task = SLOT(cred_child->cr_label);
+	parent = SLOT(src);
+	task = SLOT(dest);
 
 	/* Default to using the attributes from the parent process */
 	task->osid = parent->osid;
@@ -2436,7 +2436,7 @@
 #endif
 
 	/* Create Labels */
-	.mpo_create_cred = sebsd_create_cred,
+	.mpo_copy_cred_label = sebsd_copy_cred_label,
 	.mpo_create_devfs_device = sebsd_create_devfs_device,
 	.mpo_create_devfs_directory = sebsd_create_devfs_directory,
 	.mpo_create_devfs_symlink = sebsd_create_devfs_symlink,

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 12:54:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D238716A4D3; Thu, 15 Jan 2004 12:54:02 -0800 (PST)
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 914B016A4FC
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:54:02 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2B48F43D62
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:54:00 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FKrx0B072781
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:53:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FKrxDh072778
	for perforce@freebsd.org; Thu, 15 Jan 2004 12:53:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Thu, 15 Jan 2004 12:53:59 -0800 (PST)
Message-Id: <200401152053.i0FKrxDh072778@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45406 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: Thu, 15 Jan 2004 20:54:03 -0000

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

Change 45406 by sam@sam_ebb on 2004/01/15 12:53:09

	o consolidate the logic to enable WEP in ieee80211_encap
	o don't enable WEP for EAPOL frames for 802.1x (not exactly
	  right but close enough for now)
	o add equivalent logic to awi's private encapsulation code

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#15 edit
.. //depot/projects/netperf+sockets/sys/dev/awi/awi.c#3 edit
.. //depot/projects/netperf+sockets/sys/dev/wi/if_wi.c#5 edit
.. //depot/projects/netperf+sockets/sys/net/ethernet.h#3 edit
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#4 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#15 (text+ko) ====

@@ -789,8 +789,6 @@
 				goto bad;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
-			if (ic->ic_flags & IEEE80211_F_WEPON)
-				wh->i_fc[1] |= IEEE80211_FC1_WEP;
 		} else {
 			/*
 			 * Hack!  The referenced node pointer is in the

==== //depot/projects/netperf+sockets/sys/dev/awi/awi.c#3 (text+ko) ====

@@ -744,7 +744,7 @@
 	struct ieee80211_node *ni;
 	struct ieee80211_frame *wh;
 	struct mbuf *m, *m0;
-	int len, dowep;
+	int len;
 	u_int32_t txd, frame, ntxd;
 	u_int8_t rate;
 
@@ -754,7 +754,6 @@
 	for (;;) {
 		txd = sc->sc_txnext;
 		IF_POLL(&ic->ic_mgtq, m0);
-		dowep = 0;
 		if (m0 != NULL) {
 			len = m0->m_pkthdr.len;
 			if (awi_next_txd(sc, len, &frame, &ntxd)) {
@@ -762,6 +761,7 @@
 				break;
 			}
 			IF_DEQUEUE(&ic->ic_mgtq, m0);
+			wh = mtod(m0, struct ieee80211_frame *);
 		} else {
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
@@ -777,7 +777,6 @@
 				len += sizeof(struct llc) -
 				    sizeof(struct ether_header);
 			if (ic->ic_flags & IEEE80211_F_WEPON) {
-				dowep = 1;
 				len += IEEE80211_WEP_IVLEN +
 				    IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN;
 			}
@@ -818,7 +817,7 @@
 		if (ic->ic_rawbpf)
 			bpf_mtap(ic->ic_rawbpf, m0);
 #endif
-		if (dowep) {
+		if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
 			if ((m0 = ieee80211_wep_crypt(ifp, m0, 1)) == NULL) {
 				ifp->if_oerrors++;
 				continue;
@@ -2154,6 +2153,10 @@
 		IEEE80211_ADDR_COPY(wh->i_addr2, eh->ether_shost);
 		IEEE80211_ADDR_COPY(wh->i_addr3, eh->ether_dhost);
 	}
+	/* NB: EAPOL frames have their own encryption policy */
+	if (ic->ic_flags & IEEE80211_F_WEPON &&
+	    eh.ether_type != ETHERTYPE_EAPOL)
+		wh->i_fc[1] |= IEEE80211_FC1_WEP;
 	return m;
 }
 

==== //depot/projects/netperf+sockets/sys/dev/wi/if_wi.c#5 (text+ko) ====

@@ -921,9 +921,6 @@
 				continue;
 			}
                         wh = mtod(m0, struct ieee80211_frame *);
-			if (ic->ic_flags & IEEE80211_F_WEPON)
-				wh->i_fc[1] |= IEEE80211_FC1_WEP;
-
 		}
 #if NBPFILTER > 0
 		if (ic->ic_rawbpf)

==== //depot/projects/netperf+sockets/sys/net/ethernet.h#3 (text+ko) ====

@@ -319,6 +319,7 @@
 #define	ETHERTYPE_PPPOEDISC	0x8863	/* PPP Over Ethernet Discovery Stage */
 #define	ETHERTYPE_PPPOE		0x8864	/* PPP Over Ethernet Session Stage */
 #define	ETHERTYPE_LANPROBE	0x8888	/* HP LanProbe test? */
+#define	ETHERTYPE_EAPOL		0x888E	/* EAPOL/802.1x */
 #define	ETHERTYPE_LOOPBACK	0x9000	/* Loopback: used to test interfaces */
 #define	ETHERTYPE_LBACK		ETHERTYPE_LOOPBACK	/* DEC MOP loopback */
 #define	ETHERTYPE_XNSSM		0x9001	/* 3Com (Formerly Bridge Communications), XNS Systems Management */

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#4 (text+ko) ====

@@ -242,6 +242,10 @@
 	case IEEE80211_M_MONITOR:
 		goto bad;
 	}
+	/* NB: EAPOL frames have their own encryption policy */
+	if (ic->ic_flags & IEEE80211_F_WEPON &&
+	    eh.ether_type != ETHERTYPE_EAPOL)
+		wh->i_fc[1] |= IEEE80211_FC1_WEP;
 	*pni = ni;
 	return m;
 bad:

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 12:56:05 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8DD4B16A4D0; Thu, 15 Jan 2004 12:56:05 -0800 (PST)
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 68DF216A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:56:05 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 984BE43D53
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:56:04 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FKu40B072877
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 12:56:04 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FKu3n5072874
	for perforce@freebsd.org; Thu, 15 Jan 2004 12:56:03 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Thu, 15 Jan 2004 12:56:03 -0800 (PST)
Message-Id: <200401152056.i0FKu3n5072874@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 45408 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: Thu, 15 Jan 2004 20:56:06 -0000

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

Change 45408 by cvance@cvance_sony on 2004/01/15 12:55:38

	I really don't know where these things come from 
	(even though p4 annotate says I'm guilty)

Affected files ...

.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#6 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#6 (text+ko) ====

@@ -342,4 +342,3 @@
 types/security.te
 users
 files.lst
-foo

From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 13:56:26 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CE87316A4D1; Thu, 15 Jan 2004 13:56:25 -0800 (PST)
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 8ABA716A4CF
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 13:56:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5F83843D6D
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 13:56:20 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FLuJ0B086501
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 13:56:20 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FLuJAP086498
	for perforce@freebsd.org; Thu, 15 Jan 2004 13:56:19 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Thu, 15 Jan 2004 13:56:19 -0800 (PST)
Message-Id: <200401152156.i0FLuJAP086498@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45412 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: Thu, 15 Jan 2004 21:56:26 -0000

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

Change 45412 by sam@sam_ebb on 2004/01/15 13:55:51

	Add an ic_reset callback method to notify drivers a hardware
	reset (as opposed to full reset) is needed.  Drivers may
	implement this directly or return ENETRESET to cause a full
	reset to be done after unwinding the stack.
	
	Use this mechanism in the ath driver to reload the h/w
	state w/o kicking the 802.11 state machine.  Other drivers
	just return ENETRESET for now.

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#16 edit
.. //depot/projects/netperf+sockets/sys/dev/awi/awi.c#4 edit
.. //depot/projects/netperf+sockets/sys/dev/wi/if_wi.c#6 edit
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#8 edit
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#5 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#16 (text+ko) ====

@@ -95,7 +95,7 @@
 static void	ath_init(void *);
 static void	ath_stop(struct ifnet *);
 static void	ath_start(struct ifnet *);
-static void	ath_reset(struct ath_softc *, int);
+static int	ath_reset(struct ieee80211com *);
 static int	ath_media_change(struct ifnet *);
 static void	ath_watchdog(struct ifnet *);
 static int	ath_ioctl(struct ifnet *, u_long, caddr_t);
@@ -328,6 +328,7 @@
 	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
 
 	ic->ic_softc = sc;
+	ic->ic_reset = ath_reset;
 	ic->ic_newassoc = ath_newassoc;
 	/* XXX not right but it's not used anywhere important */
 	ic->ic_phytype = IEEE80211_T_OFDM;
@@ -508,7 +509,7 @@
 	struct ath_softc *sc = arg;
 
 	device_printf(sc->sc_dev, "hardware error; resetting\n");
-	ath_reset(sc, 0);
+	ath_reset(&sc->sc_ic);
 }
 
 static void
@@ -517,7 +518,7 @@
 	struct ath_softc *sc = arg;
 
 	device_printf(sc->sc_dev, "rx FIFO overrun; resetting\n");
-	ath_reset(sc, 0);
+	ath_reset(&sc->sc_ic);
 }
 
 static void
@@ -684,11 +685,11 @@
  * operational state.  Used to recover from errors rx overrun
  * and to reset the hardware when rf gain settings must be reset.
  */
-static void
-ath_reset(struct ath_softc *sc, int full)
+static int
+ath_reset(struct ieee80211com *ic)
 {
-	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &ic->ic_if;
+	struct ath_softc *sc = ifp->if_softc;
 	struct ath_hal *ah = sc->sc_ah;
 	struct ieee80211_channel *c;
 	HAL_STATUS status;
@@ -709,15 +710,19 @@
 	if (!ath_hal_reset(ah, ic->ic_opmode, &hchan, AH_TRUE, &status))
 		if_printf(ifp, "%s: unable to reset hardware; hal status %u\n",
 			__func__, status);
-	/* NB: only needed when called from ath_ioctl */
-	if (full && (ic->ic_flags & IEEE80211_F_WEPON))
-		ath_initkeytable(sc);
+	/*
+	 * NB: key state is preserved across resets but since we
+	 *     may be called after an ioctl call to update the
+	 *     hardware state we do this regardless.
+	 */
+	ath_initkeytable(sc);
 	ath_hal_intrset(ah, sc->sc_imask);
 	if (ath_startrecv(sc) != 0)	/* restart recv */
 		if_printf(ifp, "%s: unable to start recv logic\n", __func__);
 	ath_start(ifp);			/* restart xmit */
 	if (ic->ic_state == IEEE80211_S_RUN)
 		ath_beacon_config(sc);	/* restart beacons */
+	return 0;
 }
 
 static void
@@ -866,7 +871,7 @@
 			if (ath_debug & ATH_DEBUG_WATCHDOG)
 				ath_hal_dumpstate(sc->sc_ah);
 #endif /* AR_DEBUG */
-			ath_reset(sc, 0);
+			ath_reset(ic);
 			ifp->if_oerrors++;
 			sc->sc_stats.ast_watchdog++;
 			return;
@@ -956,20 +961,8 @@
 	default:
 		error = ieee80211_ioctl(ifp, cmd, data);
 		if (error == ENETRESET) {
-			/*
-			 * If the interface is up and running then we
-			 * want the parameter changes to take effect
-			 * immediately, so reset hardware state to
-			 * reflect parameter change(s).  We don't try to
-			 * intuit exactly what changed here; we just
-			 * bludgeon state which can have unfortunate
-			 * side effects.
-			 *
-			 * XXX doesn't recognize when a rescan is needed;
-			 *     e.g. for ssid or channel change
-			 */
 			if (UP_RUNNING(ifp))
-				ath_reset(sc, 1);
+				ath_init(sc);
 			error = 0;
 		}
 		break;
@@ -2547,7 +2540,7 @@
 		 * to load new gain values.
 		 */
 		sc->sc_stats.ast_per_rfgain++;
-		ath_reset(sc, 0);
+		ath_reset(ic);
 	}
 	if (!ath_hal_calibrate(ah, &hchan)) {
 		DPRINTF(ATH_DEBUG_ANY,

==== //depot/projects/netperf+sockets/sys/dev/awi/awi.c#4 (text+ko) ====

@@ -157,6 +157,7 @@
 #ifdef __FreeBSD__
 static void awi_init0(void *);
 #endif
+static int  awi_reset(struct ieee80211com *);
 static int  awi_init(struct ifnet *);
 static void awi_stop(struct ifnet *, int);
 static void awi_start(struct ifnet *);
@@ -313,6 +314,7 @@
 	    sc->sc_mib_phy.aSuprt_Data_Rates + 2, nrate);
 	ic->ic_sup_rates[mode].rs_nrates = nrate;
 	IEEE80211_ADDR_COPY(ic->ic_myaddr, sc->sc_mib_addr.aMAC_Address);
+	ic->ic_reset = awi_reset;
 
 	printf("%s: IEEE802.11 %s (firmware %s)\n", ifp->if_xname,
 	    (ic->ic_phytype == IEEE80211_T_FH) ? "FH" : "DS", sc->sc_banner);
@@ -544,6 +546,12 @@
 #endif
 
 static int
+awi_reset(struct ieee80211com *ic)
+{
+	return ENETRESET;		/* XXX force delayed call to awi_init */
+}
+
+static int
 awi_init(struct ifnet *ifp)
 {
 	struct awi_softc *sc = ifp->if_softc;
@@ -2155,7 +2163,7 @@
 	}
 	/* NB: EAPOL frames have their own encryption policy */
 	if (ic->ic_flags & IEEE80211_F_WEPON &&
-	    eh.ether_type != ETHERTYPE_EAPOL)
+	    eh->ether_type != ETHERTYPE_EAPOL)
 		wh->i_fc[1] |= IEEE80211_FC1_WEP;
 	return m;
 }

==== //depot/projects/netperf+sockets/sys/dev/wi/if_wi.c#6 (text+ko) ====

@@ -118,6 +118,7 @@
 #define	IFQ_POLL(ifq, m)	IF_POLL((ifq), (m))
 #define IFQ_DEQUEUE(ifq, m)	IF_DEQUEUE((ifq), (m))
 
+static int  wi_hwreset(struct ieee80211com *);
 static void wi_start(struct ifnet *);
 static int  wi_reset(struct wi_softc *);
 static void wi_watchdog(struct ifnet *);
@@ -313,6 +314,7 @@
 	ic->ic_opmode = IEEE80211_M_STA;
 	ic->ic_caps = IEEE80211_C_PMGT | IEEE80211_C_AHDEMO;
 	ic->ic_state = IEEE80211_S_INIT;
+	ic->ic_reset = wi_hwreset;
 
 	/*
 	 * Query the card for available channels and setup the
@@ -621,6 +623,12 @@
 	return;
 }
 
+static int
+wi_hwreset(struct ieee80211com *arg)
+{
+	return ENETRESET;		/* force delayed call to wi_init */
+}
+
 void
 wi_init(void *arg)
 {

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#8 (text+ko) ====

@@ -564,7 +564,7 @@
 		return EINVAL;
 	setrate:
 		ic->ic_fixed_rate = i;
-		error = ENETRESET;
+		error = (*ic->ic_reset)(ic);
 		break;
 	case WI_RID_CUR_TX_RATE:
 		return EPERM;
@@ -622,12 +622,12 @@
 				return EINVAL;
 			if ((ic->ic_flags & IEEE80211_F_PMGTON) == 0) {
 				ic->ic_flags |= IEEE80211_F_PMGTON;
-				error = ENETRESET;
+				error = (*ic->ic_reset)(ic);
 			}
 		} else {
 			if (ic->ic_flags & IEEE80211_F_PMGTON) {
 				ic->ic_flags &= ~IEEE80211_F_PMGTON;
-				error = ENETRESET;
+				error = (*ic->ic_reset)(ic);
 			}
 		}
 		break;
@@ -636,7 +636,7 @@
 			return EINVAL;
 		ic->ic_lintval = le16toh(wreq.wi_val[0]);
 		if (ic->ic_flags & IEEE80211_F_PMGTON)
-			error = ENETRESET;
+			error = (*ic->ic_reset)(ic);
 		break;
 	case WI_RID_CUR_BEACON_INT:
 		return EPERM;
@@ -678,6 +678,7 @@
 		if (i >= IEEE80211_WEP_NKID)
 			return EINVAL;
 		ic->ic_wep_txkey = i;
+		error = (*ic->ic_reset)(ic);
 		break;
 	case WI_RID_DEFLT_CRYPT_KEYS:
 		if (len != sizeof(struct wi_ltv_keys))
@@ -697,7 +698,7 @@
 			memcpy(ic->ic_nw_keys[i].wk_key,
 			    keys->wi_keys[i].wi_keydat, len);
 		}
-		error = ENETRESET;
+		error = (*ic->ic_reset)(ic);
 		break;
 	case WI_RID_MAX_DATALEN:
 		if (len != 2)
@@ -708,7 +709,7 @@
 		if (len != IEEE80211_MAX_LEN)
 			return EINVAL;		/* TODO: fragment */
 		ic->ic_fragthreshold = len;
-		error = ENETRESET;
+		error = (*ic->ic_reset)(ic);
 		break;
 	case WI_RID_IFACE_STATS:
 		error = EPERM;
@@ -910,11 +911,16 @@
 			 * passed in is not OFF.
 			 */
 			if (ireq->i_val == IEEE80211_WEP_OFF) {
-				ic->ic_flags &= ~IEEE80211_F_WEPON;
+				if (ic->ic_flags & IEEE80211_F_WEPON) {
+					ic->ic_flags &= ~IEEE80211_F_WEPON;
+					error = ENETRESET;
+				}
 			} else {
-				ic->ic_flags |= IEEE80211_F_WEPON;
+				if ((ic->ic_flags & IEEE80211_F_WEPON) == 0) {
+					ic->ic_flags |= IEEE80211_F_WEPON;
+					error = ENETRESET;
+				}
 			}
-			error = ENETRESET;
 			break;
 		case IEEE80211_IOC_WEPKEY:
 			if ((ic->ic_caps & IEEE80211_C_WEP) == 0) {
@@ -937,7 +943,7 @@
 			memcpy(ic->ic_nw_keys[kid].wk_key, tmpkey,
 				sizeof(tmpkey));
 			ic->ic_nw_keys[kid].wk_len = ireq->i_len;
-			error = ENETRESET;
+			error = (*ic->ic_reset)(ic);
 			break;
 		case IEEE80211_IOC_WEPTXKEY:
 			kid = (u_int) ireq->i_val;
@@ -946,7 +952,7 @@
 				break;
 			}
 			ic->ic_wep_txkey = kid;
-			error = ENETRESET;
+			error = (*ic->ic_reset)(ic);
 			break;
 		case IEEE80211_IOC_AUTHMODE:
 			if (!(IEEE80211_AUTH_NONE <= ireq->i_val &&
@@ -999,7 +1005,7 @@
 			case IEEE80211_POWERSAVE_OFF:
 				if (ic->ic_flags & IEEE80211_F_PMGTON) {
 					ic->ic_flags &= ~IEEE80211_F_PMGTON;
-					error = ENETRESET;
+					error = (*ic->ic_reset)(ic);
 				}
 				break;
 			case IEEE80211_POWERSAVE_ON:
@@ -1007,7 +1013,7 @@
 					error = EINVAL;
 				else if ((ic->ic_flags & IEEE80211_F_PMGTON) == 0) {
 					ic->ic_flags |= IEEE80211_F_PMGTON;
-					error = ENETRESET;
+					error = (*ic->ic_reset)(ic);
 				}
 				break;
 			default:
@@ -1021,7 +1027,7 @@
 				break;
 			}
 			ic->ic_lintval = ireq->i_val;
-			error = ENETRESET;
+			error = (*ic->ic_reset)(ic);
 			break;
 		case IEEE80211_IOC_RTSTHRESHOLD:
 			if (!(IEEE80211_RTS_MIN < ireq->i_val &&
@@ -1030,7 +1036,7 @@
 				break;
 			}
 			ic->ic_rtsthreshold = ireq->i_val;
-			error = ENETRESET;
+			error = (*ic->ic_reset)(ic);
 			break;
 		default:
 			error = EINVAL;

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#5 (text+ko) ====

@@ -150,6 +150,7 @@
 
 struct ieee80211com {
 	struct arpcom		ic_ac;
+	int			(*ic_reset)(struct ieee80211com *);
 	void			(*ic_recv_mgmt)(struct ieee80211com *,
 				    struct mbuf *, struct ieee80211_node *,
 				    int, int, u_int32_t);

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 06:56:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 135DC16A4D0; Fri, 16 Jan 2004 06:56:16 -0800 (PST)
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 DB83216A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 06:56:15 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 20D7843D39
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 06:56:12 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GEuB0B048297
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 06:56:11 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GEuBRT048294
	for perforce@freebsd.org; Fri, 16 Jan 2004 06:56:11 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Date: Fri, 16 Jan 2004 06:56:11 -0800 (PST)
Message-Id: <200401161456.i0GEuBRT048294@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45436 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: Fri, 16 Jan 2004 14:56:16 -0000

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

Change 45436 by areisse@areisse_ibook on 2004/01/16 06:55:57

	check some permissions related to the bootstrap namespaces

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.c#2 edit
.. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.defs#2 edit
.. //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/rpc_services.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.c#2 (text+ko) ====

@@ -523,6 +523,12 @@
 	if (result != KERN_SUCCESS)
 		kern_fatal(result, "mach_port_insert_right");
 
+	result = mach_set_port_label (bootstrap_self,
+				      bootstraps.bootstrap_port,
+				      "sebsd/system_u:system_r:boot_names_t");
+	if (result != KERN_SUCCESS)
+		kern_fatal(result, "mach_set_port_label");
+
 	/* keep the root bootstrap port "active" */
 	bootstraps.requestor_port = bootstraps.bootstrap_port;
 
@@ -1211,7 +1217,7 @@
 						server_demux,
 						bootstrapMaxRequestSize,
 						bootstrap_port_set,
-                        MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_SENDER)|
+                        MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_LABELS)|
                         MACH_RCV_TRAILER_TYPE(MACH_MSG_TRAILER_FORMAT_0));
 		if (mresult != MACH_MSG_SUCCESS)
 				kern_error(mresult, "mach_msg_server");

==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/bootstrap.defs#2 (text+ko) ====

@@ -141,6 +141,7 @@
 		server_uid	: integer_t;
 		on_demand	: boolean_t;
  ServerSecToken	token		: security_token_t;
+ servermsglabels labels         : msg_labels_t;
 	out	server_port	: mach_port_make_send_t);
 
 /*
@@ -213,7 +214,8 @@
 routine bootstrap_register(
 		bootstrap_port	: mach_port_t;
 		service_name	: name_t;
-		service_port	: mach_port_t);
+		service_port	: mach_port_t;
+		servermsglabels labels     : msg_labels_t);
 
 /*
  * kern_return_t
@@ -231,7 +233,8 @@
 routine bootstrap_look_up(
 		bootstrap_port	: mach_port_t;
 		service_name	: name_t;
-	out	service_port	: mach_port_t);
+	out	service_port	: mach_port_t;
+	servermsglabels labels  : msg_labels_t);
 
 /*
  * kern_return_t
@@ -259,7 +262,8 @@
 		bootstrap_port	: mach_port_t;
 		service_names	: name_array_t;
 	out	service_ports	: mach_port_array_t;
-	out	all_services_known: boolean_t);
+	out	all_services_known: boolean_t;
+	servermsglabels labels    : msg_labels_t);
 
 /*
  * kern_return_t
@@ -338,7 +342,8 @@
 routine bootstrap_subset(
 		bootstrap_port	: mach_port_t;
 		requestor_port	: mach_port_t;
-	out	subset_port	: mach_port_t);
+	out	subset_port	: mach_port_t;
+	ServerMsgLabels labels  : msg_labels_t);
 
 /*
  * kern_return_t

==== //depot/projects/trustedbsd/sedarwin/apsl/system_cmds/mach_init.tproj/rpc_services.c#2 (text+ko) ====

@@ -75,6 +75,7 @@
 	int server_uid,
 	boolean_t on_demand,
 	security_token_t sectoken,
+	msg_labels_t labels,
 	mach_port_t *server_portp)
 {
 	server_t *serverp;
@@ -97,6 +98,14 @@
 			server_cmd, sectoken.val[0], server_uid);
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	}
+
+	kern_return_t kr = mac_check_name_port_access
+	  (mach_task_self(), 
+	   labels.slabel, bootstrap_port,
+	   "mach_names", "create_server");
+	if (kr)
+	  return BOOTSTRAP_NOT_PRIVILEGED;
+
 	serverp = new_server(
 					bootstrap,
 					server_cmd,
@@ -275,8 +284,9 @@
 kern_return_t
 x_bootstrap_register(
 	mach_port_t	bootstrap_port,
-	name_t	service_name,
-	mach_port_t	service_port)
+	name_t	        service_name,
+	mach_port_t	service_port,
+	msg_labels_t    labels)
 {
 	kern_return_t result;
 	service_t *servicep;
@@ -287,6 +297,12 @@
 	debug("Register attempt for service %s port %x",
 	      service_name, service_port);
 
+	result = mac_check_name_port_access (mach_task_self(),
+					     labels.slabel, bootstrap_port,
+					     "mach_names", "register");
+	if (result)
+	  return result;
+
 	/*
 	 * Validate the bootstrap.
 	 */
@@ -393,13 +409,26 @@
 x_bootstrap_look_up(
 	mach_port_t	bootstrap_port,
 	name_t	service_name,
-	mach_port_t	*service_portp)
+	mach_port_t	*service_portp,
+	msg_labels_t     labels)
 {
 	service_t *servicep;
 	bootstrap_info_t *bootstrap;
 
 	bootstrap = lookup_bootstrap_by_port(bootstrap_port);
 	servicep = lookup_service_by_name(bootstrap, service_name);
+
+	mach_port_t sp = servicep ? servicep->port : MACH_PORT_NULL;
+	kern_return_t kr = mac_check_name_port_access
+	  (mach_task_self(),
+	   labels.slabel, sp == MACH_PORT_NULL ? bootstrap_port : sp,
+	   "mach_names", "look_up");
+	if (kr)
+	  {
+	    log("bootstrap denied %s :%d", labels.slabel, kr);
+	    return KERN_NO_ACCESS;
+	  }
+
 	if (servicep == NULL || servicep->port == MACH_PORT_NULL) {
 		if (forward_ok) {
 			debug("bootstrap_look_up service %s forwarding",
@@ -450,19 +479,21 @@
 	unsigned int	service_names_cnt,
 	mach_port_array_t	*service_portsp,
 	unsigned int	*service_ports_cnt,
-	boolean_t	*all_services_known)
+	boolean_t	*all_services_known,
+	msg_labels_t     labels)
 {
 	unsigned int i;
 	static mach_port_t service_ports[BOOTSTRAP_MAX_LOOKUP_COUNT];
 	
 	if (service_names_cnt > BOOTSTRAP_MAX_LOOKUP_COUNT)
 		return BOOTSTRAP_BAD_COUNT;
+
 	*service_ports_cnt = service_names_cnt;
 	*all_services_known = TRUE;
 	for (i = 0; i < service_names_cnt; i++) {
 		if (   x_bootstrap_look_up(bootstrap_port,
 					  service_names[i],
-					  &service_ports[i])
+					   &service_ports[i], labels)
 		    != BOOTSTRAP_SUCCESS)
 		{
 			*all_services_known = FALSE;
@@ -699,7 +730,8 @@
 x_bootstrap_subset(
 	mach_port_t	bootstrap_port,
 	mach_port_t	requestor_port,
-	mach_port_t	*subset_port)
+	mach_port_t	*subset_port,
+	msg_labels_t    labels)
 {
 	kern_return_t result;
 	bootstrap_info_t *bootstrap;
@@ -714,6 +746,12 @@
 	if (!bootstrap || !active_bootstrap(bootstrap))
 		return BOOTSTRAP_NOT_PRIVILEGED;
 
+	kern_return_t kr = mac_check_name_port_access
+	  (mach_task_self(), labels.slabel, bootstrap_port,
+	   "mach_names", "makesubset");
+	if (kr)
+	  return BOOTSTRAP_NOT_PRIVILEGED;
+
 	result = mach_port_allocate(
 				mach_task_self(), 
 				MACH_PORT_RIGHT_RECEIVE,
@@ -736,6 +774,28 @@
 	if (result != KERN_SUCCESS)
 		kern_fatal(result, "port_set_add");
 
+	char *nslabel;
+	result = security_change_context2 (labels.slabel+6, labels.slabel+6, "mach_names",
+					   &nslabel);
+	if (result)
+	  {
+	    log ("error changing context for %s", labels.slabel);
+	    nslabel = labels.slabel;
+	  }
+	else
+	  {
+	    char *n = malloc (strlen (nslabel) + 6);
+	    strcpy (n, "sebsd/");
+	    strcat (n, nslabel);
+	    free (nslabel);
+	    nslabel = n;
+	  }
+
+	result = mach_set_port_label (mach_task_self(), new_bootstrap_port,
+				      nslabel);
+	if (result != KERN_SUCCESS)
+	  kern_fatal(result, "mach_set_port_label");
+
 	subset = new_bootstrap(bootstrap, new_bootstrap_port, requestor_port);
 
 	result = mach_port_request_notification(

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 06:57:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0977516A4D0; Fri, 16 Jan 2004 06:57:16 -0800 (PST)
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 D900416A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 06:57:15 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6B0E643D48
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 06:57:14 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GEvE0B048343
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 06:57:14 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GEvEm9048340
	for perforce@freebsd.org; Fri, 16 Jan 2004 06:57:14 -0800 (PST)
	(envelope-from areisse@nailabs.com)
Date: Fri, 16 Jan 2004 06:57:14 -0800 (PST)
Message-Id: <200401161457.i0GEvEm9048340@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45438 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: Fri, 16 Jan 2004 14:57:16 -0000

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

Change 45438 by areisse@areisse_ibook on 2004/01/16 06:56:59

	Call the new sebsd call for requesting type_change rules

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/libsebsd/security_change_context.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/libsebsd/security_change_context.c#2 (text+ko) ====

@@ -93,3 +93,53 @@
 	}
 	return (0);
 }
+
+struct changesid_args
+{
+  char *domain;
+  char *source;
+  char *sclass;
+  char *out;
+  int  *outlen;
+};
+
+int
+security_change_context2(const char *domain, const char *ocontext,
+    const char *oclass, char **newcontext)
+{
+        char *outcon;
+	size_t contexts_len, n;
+	int error;
+	struct changesid_args uap;
+
+bigger:
+	uap.outlen = &contexts_len;
+	uap.domain = domain;
+	uap.source = ocontext;
+	uap.sclass = oclass;
+	uap.out = NULL;
+	if (mac_syscall ("sebsd", 4, &uap))
+	  {
+	    return (-1);
+	  }
+	outcon = malloc(contexts_len);
+	if (outcon == NULL) {
+		return (-1);
+	}
+	uap.out = outcon;
+	error = mac_syscall ("sebsd", 4, &uap);
+	/*
+	 * We could possibly race and not have a large enough space
+	 * for the current set of contexts.
+	 */
+	if (error == -1 && errno == ENOMEM) {
+		free(outcon);
+		goto bigger;
+	}
+	else if (error == -1) {
+	        free(outcon);
+		return (-1);
+	}
+	*newcontext = outcon;
+	return 0;
+}

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 09:30:26 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4DCF16A4D0; Fri, 16 Jan 2004 09:30:25 -0800 (PST)
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 A390B16A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:30:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CC4B143D54
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:30:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GHUO0B088969
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:30:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GHUOIk088964
	for perforce@freebsd.org; Fri, 16 Jan 2004 09:30:24 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Fri, 16 Jan 2004 09:30:24 -0800 (PST)
Message-Id: <200401161730.i0GHUOIk088964@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45447 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: Fri, 16 Jan 2004 17:30:26 -0000

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

Change 45447 by sam@sam_ebb on 2004/01/16 09:29:45

	when changing modes reset the rate set so drivers have
	view consistent with ic_ibss_chan; this eliminates the
	need for the hack in the ath driver where it recovers
	when the rate set is empty and also fixes a problem where
	you switch modes while operating in hostap mode

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#5 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#5 (text+ko) ====

@@ -735,6 +735,15 @@
 		ic->ic_flags &= ~IEEE80211_F_SHSLOT;
 	}
 
+	/*
+	 * Setup an initial rate set according to the
+	 * current/default channel selected above.  This
+	 * will be changed when scanning but must exist
+	 * now so driver have a consistent state of ic_ibss_chan.
+	 */
+	if (ic->ic_bss)		/* NB: can be called before lateattach */
+		ic->ic_bss->ni_rates = ic->ic_sup_rates[mode];
+
 	ic->ic_curmode = mode;
 	return 0;
 #undef N

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 09:31:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D0DA16A4D0; Fri, 16 Jan 2004 09:31:30 -0800 (PST)
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 71C6616A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:31:30 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B427843D55
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:31:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GHVQ0B089923
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 09:31:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GHVQmr089914
	for perforce@freebsd.org; Fri, 16 Jan 2004 09:31:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Fri, 16 Jan 2004 09:31:26 -0800 (PST)
Message-Id: <200401161731.i0GHVQmr089914@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45448 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: Fri, 16 Jan 2004 17:31:31 -0000

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

Change 45448 by sam@sam_ebb on 2004/01/16 09:31:17

	ETHERTYPE_EAPOL -> ETHERTYPE_PAE (from onoe-san)

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/awi/awi.c#5 edit
.. //depot/projects/netperf+sockets/sys/net/ethernet.h#4 edit
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#5 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/awi/awi.c#5 (text+ko) ====

@@ -2161,9 +2161,8 @@
 		IEEE80211_ADDR_COPY(wh->i_addr2, eh->ether_shost);
 		IEEE80211_ADDR_COPY(wh->i_addr3, eh->ether_dhost);
 	}
-	/* NB: EAPOL frames have their own encryption policy */
-	if (ic->ic_flags & IEEE80211_F_WEPON &&
-	    eh->ether_type != ETHERTYPE_EAPOL)
+	/* NB: PAE frames have their own encryption policy */
+	if (ic->ic_flags & IEEE80211_F_WEPON && eh->ether_type != ETHERTYPE_PAE)
 		wh->i_fc[1] |= IEEE80211_FC1_WEP;
 	return m;
 }

==== //depot/projects/netperf+sockets/sys/net/ethernet.h#4 (text+ko) ====

@@ -319,7 +319,7 @@
 #define	ETHERTYPE_PPPOEDISC	0x8863	/* PPP Over Ethernet Discovery Stage */
 #define	ETHERTYPE_PPPOE		0x8864	/* PPP Over Ethernet Session Stage */
 #define	ETHERTYPE_LANPROBE	0x8888	/* HP LanProbe test? */
-#define	ETHERTYPE_EAPOL		0x888E	/* EAPOL/802.1x */
+#define	ETHERTYPE_PAE		0x888E	/* EAPOL PAE/802.1x */
 #define	ETHERTYPE_LOOPBACK	0x9000	/* Loopback: used to test interfaces */
 #define	ETHERTYPE_LBACK		ETHERTYPE_LOOPBACK	/* DEC MOP loopback */
 #define	ETHERTYPE_XNSSM		0x9001	/* 3Com (Formerly Bridge Communications), XNS Systems Management */

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#5 (text+ko) ====

@@ -242,9 +242,8 @@
 	case IEEE80211_M_MONITOR:
 		goto bad;
 	}
-	/* NB: EAPOL frames have their own encryption policy */
-	if (ic->ic_flags & IEEE80211_F_WEPON &&
-	    eh.ether_type != ETHERTYPE_EAPOL)
+	/* NB: PAE frames have their own encryption policy */
+	if (ic->ic_flags & IEEE80211_F_WEPON && eh.ether_type != ETHERTYPE_PAE)
 		wh->i_fc[1] |= IEEE80211_FC1_WEP;
 	*pni = ni;
 	return m;

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 11:10:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A275E16A4D0; Fri, 16 Jan 2004 11:10:30 -0800 (PST)
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 797C516A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:10:30 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7BBC943D4C
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:10:28 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GJAS0B012418
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:10:28 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GJAS9E012411
	for perforce@freebsd.org; Fri, 16 Jan 2004 11:10:28 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Fri, 16 Jan 2004 11:10:28 -0800 (PST)
Message-Id: <200401161910.i0GJAS9E012411@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45452 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: Fri, 16 Jan 2004 19:10:31 -0000

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

Change 45452 by jhb@jhb_slimer on 2004/01/16 11:09:55

	Use a cv rather than a semaphore.  Less lock operations that way.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_ktrace.c#36 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_ktrace.c#36 (text+ko) ====

@@ -54,7 +54,6 @@
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 #include <sys/ktrace.h>
-#include <sys/sema.h>
 #include <sys/sx.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
@@ -108,7 +107,7 @@
 
 static int print_message = 1;
 struct mtx ktrace_mtx;
-static struct sema ktrace_sema;
+static struct cv ktrace_cv;
 
 static void ktrace_init(void *dummy);
 static int sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS);
@@ -129,7 +128,7 @@
 	int i;
 
 	mtx_init(&ktrace_mtx, "ktrace", NULL, MTX_DEF | MTX_QUIET);
-	sema_init(&ktrace_sema, 0, "ktrace");
+	cv_init(&ktrace_cv, "ktrace");
 	STAILQ_INIT(&ktr_todo);
 	STAILQ_INIT(&ktr_free);
 	for (i = 0; i < ktr_requestpool; i++) {
@@ -263,8 +262,8 @@
 
 	mtx_lock(&ktrace_mtx);
 	STAILQ_INSERT_TAIL(&ktr_todo, req, ktr_list);
+	cv_signal(&ktrace_cv);
 	mtx_unlock(&ktrace_mtx);
-	sema_post(&ktrace_sema);
 	curthread->td_pflags &= ~TDP_INKTRACE;
 }
 
@@ -296,8 +295,9 @@
 	td = curthread;
 	cred = td->td_ucred;
 	for (;;) {
-		sema_wait(&ktrace_sema);
 		mtx_lock(&ktrace_mtx);
+		while (STAILQ_EMPTY(&ktr_todo))
+			cv_wait(&ktrace_cv, &ktrace_mtx);
 		req = STAILQ_FIRST(&ktr_todo);
 		STAILQ_REMOVE_HEAD(&ktr_todo, ktr_list);
 		KASSERT(req != NULL, ("got a NULL request"));

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 11:16:37 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7CBF716A4D0; Fri, 16 Jan 2004 11:16:37 -0800 (PST)
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 57D6316A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:16:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7A7AB43D41
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:16:36 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GJGa0B014353
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:16:36 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GJGaDo014350
	for perforce@freebsd.org; Fri, 16 Jan 2004 11:16:36 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Fri, 16 Jan 2004 11:16:36 -0800 (PST)
Message-Id: <200401161916.i0GJGaDo014350@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45453 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: Fri, 16 Jan 2004 19:16:38 -0000

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

Change 45453 by jhb@jhb_slimer on 2004/01/16 11:16:12

	- Fix psignal() to check P_SYSTEM to see if a process is a system
	  process, not just the pid.
	- Fix kill() to not send signals to a system process and return
	  EINVAL instead.  Is this incorrect given that init gets signals?

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_sig.c#82 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_sig.c#82 (text+ko) ====

@@ -1392,7 +1392,10 @@
 		/* kill single process */
 		if ((p = pfind(uap->pid)) == NULL)
 			return (ESRCH);
-		error = p_cansignal(td, p, uap->signum);
+		if (p->p_pid <= 1 || p->p_flag & P_SYSTEM)
+			error = EPERM;
+		else
+			error = p_cansignal(td, p, uap->signum);
 		if (error == 0 && uap->signum)
 			psignal(p, uap->signum);
 		PROC_UNLOCK(p);
@@ -2144,7 +2147,7 @@
 			/*
 			 * Don't take default actions on system processes.
 			 */
-			if (p->p_pid <= 1) {
+			if (p->p_pid <= 1 || p->p_flag & P_SYSTEM) {
 #ifdef DIAGNOSTIC
 				/*
 				 * Are you sure you want to ignore SIGSEGV

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 11:20:51 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E0A6D16A4D0; Fri, 16 Jan 2004 11:20:50 -0800 (PST)
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 BA3BD16A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:20:50 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 08AB643D1D
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:20:42 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GJKf0B014567
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:20:41 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GJKfJh014564
	for perforce@freebsd.org; Fri, 16 Jan 2004 11:20:41 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Fri, 16 Jan 2004 11:20:41 -0800 (PST)
Message-Id: <200401161920.i0GJKfJh014564@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45454 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: Fri, 16 Jan 2004 19:20:51 -0000

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

Change 45454 by jhb@jhb_slimer on 2004/01/16 11:19:46

	Fudge the last patch to allow userland to send signals to init, but
	not any other system processes.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_sig.c#83 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_sig.c#83 (text+ko) ====

@@ -1392,7 +1392,7 @@
 		/* kill single process */
 		if ((p = pfind(uap->pid)) == NULL)
 			return (ESRCH);
-		if (p->p_pid <= 1 || p->p_flag & P_SYSTEM)
+		if (p->p_pid != 1 && p->p_flag & P_SYSTEM)
 			error = EPERM;
 		else
 			error = p_cansignal(td, p, uap->signum);

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 11:22:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 464C916A4D0; Fri, 16 Jan 2004 11:22:23 -0800 (PST)
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 20F6516A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:22:23 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B183143D79
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:21:43 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0GJLh0B015686
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 11:21:43 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0GJLhL3015679
	for perforce@freebsd.org; Fri, 16 Jan 2004 11:21:43 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Fri, 16 Jan 2004 11:21:43 -0800 (PST)
Message-Id: <200401161921.i0GJLhL3015679@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45455 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: Fri, 16 Jan 2004 19:22:23 -0000

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

Change 45455 by jhb@jhb_slimer on 2004/01/16 11:21:41

	More crap in this branch now.

Affected files ...

.. //depot/projects/smpng/sys/notes#5 edit

Differences ...

==== //depot/projects/smpng/sys/notes#5 (text+ko) ====

@@ -50,6 +50,10 @@
 - Minor fixes to taskqueue locking including making the locking for the
   taskqueue thread queeu actually work.
   - Untested
+- Don't allow kthreads to get signalled and do bad things
+  - Untested
+- Change ktrace to just use a cv rather than a semaphore
+  - Untested
 - Add a kproc API that does what kthread does right now
 - Add a real kthread API that creates just another thread inside of a kproc
   - Figure out what needs to be done to make a new kthread.. should each

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 19:49:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6631C16A4D0; Fri, 16 Jan 2004 19:49:18 -0800 (PST)
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 3D32C16A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 19:49:18 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3A44C43D1D
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 19:49:16 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0H3nG0B042887
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 19:49:16 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0H3nFjl042884
	for perforce@freebsd.org; Fri, 16 Jan 2004 19:49:15 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 16 Jan 2004 19:49:15 -0800 (PST)
Message-Id: <200401170349.i0H3nFjl042884@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45473 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: Sat, 17 Jan 2004 03:49:18 -0000

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

Change 45473 by rwatson@rwatson_tislabs on 2004/01/16 19:48:38

	Separate allocation of per-process audit storage from the
	initialization of that storage, so as to share allocation
	functions between kproc0, init, and future processes, and also
	to avoid allocating while holding process locks.  
	
	Initialize the first kernel process using its own hook,
	audit_proc_kproc0(), and employ the init initialization hook,
	audit_proc_init() on the init process.  
	
	Fix a typo in the MAC fix for freeing process state.
	
	Don't free audit storage until we're ready to free the proc,
	or it's zeroed when we try to audit the exit.
	
	Create the audit_worker thread using RFHIGHPID so that it
	doesn't grab pid 1, breaking init.
	
	KASSERT various sorts of things about p_au during the process
	life cycle, such as that it is null when the process is to be
	created, and otherwise non-NULL.  
	
	Some gratuitous parentheses that we'll remove later, but I put
	in to be safe while trying to debug memory corruption.
	
	Audit framework now properly tracks process audit state,
	and appears to safely gather audit records for process exit.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/kern/init_main.c#4 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_exit.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/kern/kern_fork.c#5 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#14 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#12 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/kern/init_main.c#4 (text+ko) ====

@@ -399,7 +399,7 @@
 	p->p_ucred->cr_prison = NULL;	/* Don't jail it. */
 #ifdef AUDIT
 	audit_proc_alloc(p);
-	audit_proc_init(p);
+	audit_proc_kproc0(p);
 #endif
 #ifdef MAC
 	mac_create_proc0(p->p_ucred);
@@ -697,6 +697,9 @@
 #ifdef MAC
 	mac_create_proc1(newcred);
 #endif
+#ifdef AUDIT
+	audit_proc_init(initproc);
+#endif
 	initproc->p_ucred = newcred;
 	PROC_UNLOCK(initproc);
 	crfree(oldcred);

==== //depot/projects/trustedbsd/audit2/sys/kern/kern_exit.c#3 (text+ko) ====

@@ -688,9 +688,6 @@
 			 */
 			crfree(p->p_ucred);
 			p->p_ucred = NULL;
-#ifdef AUDIT
-			audit_proc_free(p);
-#endif
 			pargs_drop(p->p_args);
 			p->p_args = NULL;
 			sigacts_free(p->p_sigacts);
@@ -710,6 +707,9 @@
 #ifdef MAC
 			mac_destroy_proc(p);
 #endif
+#ifdef AUDIT
+			audit_proc_free(p);
+#endif
 			KASSERT(FIRST_THREAD_IN_PROC(p),
 			    ("wait1: no residual thread!"));
 			uma_zfree(proc_zone, p);

==== //depot/projects/trustedbsd/audit2/sys/kern/kern_fork.c#5 (text+ko) ====

@@ -747,7 +747,7 @@
 			uid);
 	sx_xunlock(&allproc_lock);
 #ifdef MAC
-	mac_proc_destroy(newproc);
+	mac_destroy_proc(newproc);
 #endif
 #ifdef AUDIT
 	audit_proc_free(newproc);

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#14 (text+ko) ====

@@ -41,6 +41,7 @@
 #include <sys/ucred.h>
 #include <sys/uio.h>
 #include <sys/un.h>
+#include <sys/unistd.h>
 #include <sys/vnode.h>
 
 #include <security/audit/audit_private.h>
@@ -416,8 +417,8 @@
 	/* Initialize the BSM audit subsystem. */
 	kau_init();
 
-	error = kthread_create(audit_worker, NULL, &audit_thread, 0, 0,
-	    "audit_worker");
+	error = kthread_create(audit_worker, NULL, &audit_thread, RFHIGHPID,
+	    0, "audit_worker");
 	if (error != 0)
 		panic("audit_init: kthread_create returned %d", error);
 }
@@ -1301,7 +1302,10 @@
 audit_proc_alloc(struct proc *p)
 {
 
-	p->p_au = malloc(sizeof(*p->p_au), M_AUDIT, M_WAITOK);
+	KASSERT(p->p_au == NULL, ("audit_proc_alloc: p->p_au != NULL (%d)",
+	    p->p_pid));
+	p->p_au = malloc(sizeof(*(p->p_au)), M_AUDIT, M_WAITOK);
+	//printf("audit_proc_alloc: pid %d p_au %p\n", p->p_pid, p->p_au);
 }
 
 /* 
@@ -1311,10 +1315,23 @@
  * session ID, etc. 
  */
 void
+audit_proc_kproc0(struct proc *p)
+{
+
+	KASSERT(p->p_au != NULL, ("audit_proc_kproc0: p->p_au == NULL (%d)",
+	    p->p_pid));
+	//printf("audit_proc_kproc0: pid %d p_au %p\n", p->p_pid, p->p_au);
+	bzero(p->p_au, sizeof(*(p)->p_au));
+}
+
+void
 audit_proc_init(struct proc *p)
 {
 
-	bzero((void *)p->p_au, sizeof(*p->p_au));
+	KASSERT(p->p_au != NULL, ("audit_proc_init: p->p_au == NULL (%d)",
+	    p->p_pid));
+	//printf("audit_proc_init: pid %d p_au %p\n", p->p_pid, p->p_au);
+	bzero(p->p_au, sizeof(*(p)->p_au));
 }
 
 /* 
@@ -1327,6 +1344,14 @@
 
 	PROC_LOCK_ASSERT(parent, MA_OWNED);
 	PROC_LOCK_ASSERT(child, MA_OWNED);
+	KASSERT(parent->p_au != NULL,
+	    ("audit_proc_fork: parent->p_au == NULL (%d)", parent->p_pid));
+	KASSERT(child->p_au != NULL,
+	    ("audit_proc_fork: child->p_au == NULL (%d)", child->p_pid));
+	//printf("audit_proc_fork: parent pid %d p_au %p\n", parent->p_pid,
+	//    parent->p_au);
+	//printf("audit_proc_fork: child pid %d p_au %p\n", child->p_pid,
+	//    child->p_au);
 	bcopy(parent->p_au, child->p_au, sizeof(*child->p_au));
 }
 
@@ -1337,6 +1362,8 @@
 audit_proc_free(struct proc *p)
 {
 
+	KASSERT(p->p_au != NULL, ("p->p_au == NULL (%d)", p->p_pid));
+	//printf("audit_proc_free: pid %d p_au %p\n", p->p_pid, p->p_au);
 	free(p->p_au, M_AUDIT);
 	p->p_au = NULL;
 }

==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#12 (text+ko) ====

@@ -155,10 +155,11 @@
 void			 audit_arg_svipc_addr(void *addr);
 
 void			 audit_proc_alloc(struct proc *p);
-void			 audit_proc_init(struct proc *p);
 void			 audit_proc_fork(struct proc *parent, 
 					 struct proc *child);
 void			 audit_proc_free(struct proc *p);
+void			 audit_proc_init(struct proc *p);
+void			 audit_proc_kproc0(struct proc *p);
 
 /*
  * Define a macro to wrap the audit_arg_* calls by checking the global

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 21:22:13 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EAC516A4D0; Fri, 16 Jan 2004 21:22:13 -0800 (PST)
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 1FD5016A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 21:22:13 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9C90743D5E
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 21:22:10 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0H5MA0B070782
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 21:22:10 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0H5MA9K070773
	for perforce@freebsd.org; Fri, 16 Jan 2004 21:22:10 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Fri, 16 Jan 2004 21:22:10 -0800 (PST)
Message-Id: <200401170522.i0H5MA9K070773@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45474 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: Sat, 17 Jan 2004 05:22:13 -0000

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

Change 45474 by marcel@marcel_nfs on 2004/01/16 21:22:08

	Remove files not in the 20040112 weekly snapshot of GDB.

Affected files ...

.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-96#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-97#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-98#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/arc-tdep.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/ch-exp.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/ch-lang.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/ch-lang.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/ch-typeprint.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/ch-valprint.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/command.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/dst.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/dstread.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2cfi.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2cfi.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/gdba.el#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/gnu-regex.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/gnu-regex.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/hp-psymtab-read.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/hp-symtab-read.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/hpread.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/i386nbsd-nat.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/i387-nat.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/i387-nat.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/partial-stab.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/saber.suppress#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/signals.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/signals.h#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-linux-nat.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/sparcl-stub.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/sparcl-tdep.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/sparclet-rom.c#2 delete
.. //depot/projects/gdb/contrib/gdb/gdb/sparclet-stub.c#2 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 22:05:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7335C16A4D0; Fri, 16 Jan 2004 22:05:23 -0800 (PST)
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 4870216A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 22:05:23 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 524BA43D54
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 22:05:19 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0H65J0B081641
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 22:05:19 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0H653O2081611
	for perforce@freebsd.org; Fri, 16 Jan 2004 22:05:03 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Fri, 16 Jan 2004 22:05:03 -0800 (PST)
Message-Id: <200401170605.i0H653O2081611@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45477 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: Sat, 17 Jan 2004 06:05:24 -0000

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

Change 45477 by marcel@marcel_nfs on 2004/01/16 22:04:47

	Import of gdb subdirectory of weekly snapshot, dated 20040112.
	Sub-directories of gdb not imported are:
		osf-share
		rdi-share
		testsuite
		vx-share
	More removal of unneeded files to follow later.

Affected files ...

.. //depot/projects/gdb/contrib/gdb/gdb/CONTRIBUTE#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/COPYING#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1990#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1991#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1992#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1993#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1994#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1995#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1996#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1997#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1998#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-1999#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-2000#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-2001#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-2002#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-2003#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ChangeLog-3.x#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/MAINTAINERS#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/Makefile.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/NEWS#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/PROBLEMS#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/README#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/TODO#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/abug-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/acconfig.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/acinclude.m4#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/aclocal.m4#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ada-exp.tab.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ada-exp.y#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ada-lang.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ada-lang.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ada-lex.l#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ada-tasks.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ada-typeprint.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ada-valprint.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/aix-thread.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alpha-linux-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alpha-mdebug-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alpha-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alpha-osf1-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alpha-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/alpha-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alphabsd-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/alphabsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alphabsd-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/alphafbsd-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/alphanbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/amd64-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/amd64-nat.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/amd64bsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/amd64fbsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/amd64fbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/amd64nbsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/amd64nbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/annotate.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/annotate.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/arch-utils.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/arch-utils.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/arm-linux-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/arm-linux-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/arm-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/arm-tdep.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/armnbsd-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/armnbsd-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/avr-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ax-gdb.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ax-gdb.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ax-general.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ax.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/bcache.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/bcache.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/bfd-target.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/bfd-target.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/block.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/block.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/blockframe.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/breakpoint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/breakpoint.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/buildsym.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/buildsym.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/c-exp.tab.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/c-exp.y#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/c-lang.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/c-lang.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/c-typeprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/c-valprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/call-cmds.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/charset.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/charset.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cli-out.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli-out.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-cmds.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-cmds.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-decode.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-decode.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-dump.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-dump.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-interp.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-logging.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-script.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-script.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-setshow.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-setshow.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-utils.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-utils.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/coff-pe-read.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/coff-pe-read.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/coff-solib.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/coff-solib.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/coffread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/command.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/complaints.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/complaints.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/completer.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/completer.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha-linux.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha-linux.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha-osf1.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha-osf1.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha-osf2.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha-osf3.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/fbsd.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/fbsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nbsd.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nbsd.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-fbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-osf.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-osf2.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-osf3.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-alpha.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-alphalinux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-fbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/xm-alphalinux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/xm-alphaosf.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/embed.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/linux.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/linux.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nbsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nbsdaout.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nbsdelf.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nm-nbsdaout.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-arm.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-embed.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-wince.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/wince.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/xm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/arm/xm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/avr/avr.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/cris/cris.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/cris/tm-cris.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/d10v/d10v.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/djgpp/README#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/djgpp/config.sed#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/djgpp/djcheck.sh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/djgpp/djconfig.sh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/djgpp/fnchange.lst#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/frv/frv.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/frv/tm-frv.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/h8300/h8300.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/h8300/tm-h8300.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/cygwin.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/cygwin.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/embed.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd64.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/go32.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/go32.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386aout.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386bsd.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386bsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386gnu.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386gnu.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386lynx.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386lynx.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386nw.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sco.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sco4.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sco5.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sol2.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sol2.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v4.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v42mp.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/interix.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/interix.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/linux.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/linux.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsd64.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsd64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsdaout.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsdelf.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/ncr3000.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/ncr3000.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-cygwin.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-fbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-fbsd64.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-go32.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386bsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386gnu.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386lynx.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sco.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sco4.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sco5.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sol2.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v4.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-interix.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-nbsdaout.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-nto.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-obsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-x86-64linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nto.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nto.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-cygwin.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-fbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-go32.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386bsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386lynx.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386sol2.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-nto.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-vxworks.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-x86-64linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/vxworks.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/x86-64linux.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/x86-64linux.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-cygwin.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-go32.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386bsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386sco.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386v.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386v4.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/aix.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/aix.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/ia64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/linux.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/linux.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/nm-aix.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/nm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-aix.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-ia64.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/xm-aix.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/xm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/m32r/m32r.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68hc11/m68hc11.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/3b1.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/3b1.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/cisco.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/delta68.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/delta68.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/dpx2.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/dpx2.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/linux.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/linux.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/m68klynx.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/m68klynx.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/m68kv4.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/m68kv4.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/monitor.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nbsdaout.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nbsdaout.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-delta68.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-dpx2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-m68klynx.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-nbsdaout.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-sun2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-sun3.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/nm-sysv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/os68k.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/st2000.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun2os3.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun2os3.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun2os4.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun2os4.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun3os3.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun3os3.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun3os4.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/sun3os4.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-3b1.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-cisco.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-delta68.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-dpx2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-m68k.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-m68klynx.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-m68kv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-monitor.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-os68k.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-st2000.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-sun2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-sun2os4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-sun3.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-sun3os4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/tm-vx68.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/vxworks68.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-3b1.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-delta68.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-dpx2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-m68k.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-m68kv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-sun2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-sun3.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/m68k/xm-sun3os4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mcore/mcore.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/decstation.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/embed.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/irix5.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/irix5.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/irix6.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/irix6.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/linux.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/linux.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/littlemips.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/mipsv4.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/mipsv4.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nbsd.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nbsd.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/news-mips.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-irix5.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-mips.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-news-mips.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-riscos.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/riscos.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-irix5.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-irix6.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-mips.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-mipsv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-vxmips.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-wince.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/vxmips.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/wince.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/xm-irix5.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/xm-mips.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/xm-mipsv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mips/xm-riscos.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/mn10300/mn10300.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/nm-gnu.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/nm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/nm-lynx.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/nm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/nm-nbsdaout.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/nm-sysv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/none/nm-none.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/none/none.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/none/none.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/none/tm-none.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/none/xm-none.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/ns32k/nbsdaout.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/ns32k/nbsdaout.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/ns32k/nm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/ns32k/nm-nbsdaout.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/ns32k/tm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/ns32k/tm-ns32k.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/ns32k/xm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/hppa.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/hppa64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/hppahpux.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/hppahpux.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/hpux1020.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/hpux11.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/hpux11w.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/nm-hppah.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/nm-hppah11.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/tm-hppa.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/tm-hppa64.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/tm-hppah.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/pa/xm-hppah.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/aix.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/aix.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/aix432.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/linux.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/linux.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nbsd.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nbsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nm-aix.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nm-ppc64-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/ppc64-linux.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-vxworks.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/vxworks.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/xm-aix.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/xm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/aix4.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/aix4.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/tm-rs6000-aix4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/xm-aix4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/s390/nm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/s390/s390.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/s390/s390.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/s390/s390x.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/s390/tm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/s390/tm-s390.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/embed.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/linux.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/nbsd.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/nbsd.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/nm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/tm-linux.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/tm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/tm-sh.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/tm-wince.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sh/wince.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/fbsd.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/fbsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/linux.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/linux.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/linux64.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/linux64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsd.mt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsd64.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsd64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsdaout.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsdelf.mh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-fbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-nbsdaout.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-sol2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sol2-64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sol2.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sol2.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sparc.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sparc64.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-fbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-nbsd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-nbsd64.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-sol2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-vxworks.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/vxworks.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/tm-linux.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/tm-lynx.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/tm-nto.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/tm-sunos.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/tm-sysv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/tm-vxworks.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/config/v850/v850.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/nm-vax.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/tm-vax.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/tm-vaxbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/vax.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/vaxbsd.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/vaxult.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/vaxult2.mh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/xm-vax.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/xm-vaxbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/xm-vaxult.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/vax/xm-vaxult2.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/xm-aix4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/xm-nbsd.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/xm-sysv4.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/config/xstormy16/xstormy16.mt#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/configure#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/configure.host#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/configure.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/configure.tgt#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/copying.awk#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/copying.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/core-aout.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/core-regset.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/core-sol2.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/corefile.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/corelow.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cp-abi.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cp-abi.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cp-namespace.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cp-support.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cp-support.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cp-valprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/cpu32bug-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/cris-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/d10v-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dbug-rom.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/dbxread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/dcache.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/dcache.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/defs.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/delta68-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/demangle.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/dictionary.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dictionary.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dink32-rom.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/disasm.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/disasm.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/ChangeLog#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/GDBvn.texi#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/LRS#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/Makefile.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/a4rc.sed#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/agentexpr.texi#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/all-cfg.texi#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/annotate.info#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/annotate.texinfo#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/configure#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/configure.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/fdl.texi#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.info#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.info-1#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.info-2#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.info-3#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.texinfo#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gdbint.info#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gdbint.texinfo#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/gpl.texi#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/lpsrc.sed#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/observer.texi#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/psrc.sed#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/refcard.tex#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doc/stabs.info#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/doc/stabs.texinfo#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doublest.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/doublest.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/dpx2-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dsrec.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/dummy-frame.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dummy-frame.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dve3900-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2-frame.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2-frame.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2expr.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2expr.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2loc.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2loc.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/dwarf2read.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/dwarfread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/elfread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/environ.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/environ.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/eval.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/event-loop.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/event-loop.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/event-top.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/event-top.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/exc_request.defs#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/exec.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/exec.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/expprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/expression.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/f-exp.tab.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/f-exp.y#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/f-lang.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/f-lang.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/f-typeprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/f-valprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/fbsd-proc.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/findvar.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/fork-child.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/frame-base.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/frame-base.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/frame-unwind.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/frame-unwind.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/frame.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/frame.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/frv-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gcore.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb-events.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb-events.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb-events.sh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb-stabs.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb.1#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdb.gdb#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_assert.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_dirent.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_gcore.sh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_indent.sh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_locale.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_mbuild.sh#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_obstack.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_proc_service.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_regex.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_stat.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_string.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_thread_db.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_vfork.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdb_wait.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbarch.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbarch.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbarch.sh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbcmd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbcore.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbinit.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/ChangeLog#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/Makefile.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/README#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/acconfig.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/acinclude.m4#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/aclocal.m4#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/config.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/config.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/configure#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/configure.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/configure.srv#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/gdbreplay.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/gdbserver.1#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/i387-fp.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/i387-fp.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/inferiors.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-arm-low.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-i386-low.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-ia64-low.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-low.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-low.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-m68k-low.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-mips-low.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-ppc-low.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-s390-low.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-sh-low.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/linux-x86-64-low.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/mem-break.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/mem-break.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/proc-service.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/regcache.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/regcache.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/remote-utils.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/server.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/server.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/stamp-h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/target.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/target.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/terminal.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/thread-db.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/utils.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbthread.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbtypes.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gdbtypes.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/glibc-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/glibc-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gnu-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gnu-nat.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gnu-v2-abi.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/gnu-v3-abi.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/go32-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/gregset.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/h8300-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/hpacc-abi.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/hppa-hpux-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/hppa-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/hppa-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/hppah-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/hpread.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/hpux-thread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386-cygwin-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386-interix-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386-interix-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386-linux-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386-linux-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386-linux-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386-nto-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386-sol2-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386-stub.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386-tdep.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386b-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386bsd-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386bsd-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386fbsd-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386fbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386gnu-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386gnu-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386ly-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386nbsd-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i386obsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386obsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386v-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i386v4-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/i387-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/i387-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ia64-aix-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ia64-aix-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ia64-linux-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ia64-linux-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/inf-loop.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/inf-loop.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/infcall.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/infcall.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/infcmd.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/inferior.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/inflow.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/inflow.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/infptrace.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/infrun.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/infttrace.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/infttrace.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/interps.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/interps.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/irix5-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/jv-exp.tab.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/jv-exp.y#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/jv-lang.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/jv-lang.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/jv-typeprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/jv-valprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/kod-cisco.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/kod.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/kod.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/language.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/language.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/libunwind-frame.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/libunwind-frame.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/lin-lwp.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/linespec.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/linespec.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/linux-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/linux-nat.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/linux-proc.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/lynx-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m2-exp.tab.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m2-exp.y#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/m2-lang.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/m2-lang.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/m2-typeprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/m2-valprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/m32r-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m32r-stub.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m32r-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68hc11-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68k-stub.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68k-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68k-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68klinux-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68klinux-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68knbsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/m68knbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/macrocmd.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/macroexp.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/macroexp.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/macroscope.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/macroscope.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/macrotab.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/macrotab.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/main.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/main.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/maint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mcore-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mcore-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mdebugread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mem-break.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/memattr.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/memattr.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/ChangeLog#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-break.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-disas.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-env.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-file.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-stack.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-var.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmds.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmds.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-console.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-console.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-getopt.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-getopt.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-interp.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-main.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-main.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-out.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-out.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-parse.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-parse.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-symbol-cmds.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/minimon.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/minsyms.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mips-irix-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mips-linux-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mips-linux-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mips-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mips-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mips-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mipsnbsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mipsnbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mipsnbsd-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mipsread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/mipsv4-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/mn10300-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/monitor.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/monitor.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/msg.defs#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/msg_reply.defs#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/nbsd-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/Makefile.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/configure#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/configure.in#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/gdbserve.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/gdbserve.def#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/i386.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/i386.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/ppc.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/ppc.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlm/prelude.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/nlmread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/notify.defs#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ns32k-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ns32k-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ns32knbsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ns32knbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/nto-procfs.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/nto-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/nto-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/objc-exp.tab.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/objc-exp.y#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/objc-lang.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/objc-lang.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/objfiles.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/objfiles.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/observer.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/observer.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ocd.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ocd.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/osabi.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/osabi.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/p-exp.tab.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/p-exp.y#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/p-lang.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/p-lang.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/p-typeprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/p-valprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/pa64solib.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/pa64solib.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/parse.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/parser-defs.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ppc-bdm.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ppc-linux-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ppc-linux-tdep.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ppc-sysv-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ppc-tdep.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ppcbug-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ppcnbsd-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ppcnbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ppcnbsd-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/printcmd.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/proc-api.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/proc-events.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/proc-flags.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/proc-service.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/proc-utils.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/proc-why.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/process_reply.defs#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/procfs.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/regcache.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regcache.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-arm.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-i386-linux.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-i386.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-ia64.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-m68k.dat#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-mips.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-ppc.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-s390.dat#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-s390x.dat#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-sh.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-x86-64.dat#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/regdat.sh#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/regformats/regdef.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/reggroups.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/reggroups.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/regset.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-e7000.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-est.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-fileio.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-fileio.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-hms.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-m32r-sdi.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-mips.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-rdi.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/remote-rdp.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-sds.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-sim.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-st.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-utils.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/remote-utils.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/remote-vx.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-vx68.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-vxmips.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote-vxsparc.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/remote.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/remote.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/reply_mig_hack.awk#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/rom68k-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/rs6000-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/rs6000-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/s390-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/s390-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/scm-exp.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/scm-lang.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/scm-lang.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/scm-tags.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/scm-valprint.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/sentinel-frame.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sentinel-frame.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ser-e7kpc.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ser-go32.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/ser-pipe.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ser-tcp.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ser-unix.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/ser-unix.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/serial.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/serial.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/sh-stub.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sh-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sh-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sh3-rom.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sh64-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/shnbsd-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/shnbsd-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/shnbsd-tdep.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/signals/signals.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/sim-regno.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sol-thread.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solib-aix5.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/solib-irix.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/solib-legacy.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solib-osf.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solib-sunos.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solib-svr4.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solib-svr4.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solib.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solib.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/solist.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/somread.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/somsolib.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/somsolib.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/source.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/source.h#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-linux-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-nat.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-nat.h#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-sol2-nat.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-sol2-tdep.c#1 add
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-stub.c#2 edit
.. //depot/projects/gdb/contrib/gdb/gdb/sparc-tdep.c#2 edit

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 23:16:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 638AA16A4D0; Fri, 16 Jan 2004 23:16:53 -0800 (PST)
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 3D49F16A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 23:16:53 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3F22D43D46
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 23:16:47 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0H7Gl0B098710
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 23:16:47 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0H7GksX098707
	for perforce@freebsd.org; Fri, 16 Jan 2004 23:16:46 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Date: Fri, 16 Jan 2004 23:16:46 -0800 (PST)
Message-Id: <200401170716.i0H7GksX098707@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45480 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: Sat, 17 Jan 2004 07:16:53 -0000

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

Change 45480 by scottl@scottl-netperf on 2004/01/16 23:16:14

	IFC @ 45479

Affected files ...

.. //depot/projects/netperf/sys/Makefile#2 integrate
.. //depot/projects/netperf/sys/compat/ndis/hal_var.h#2 integrate
.. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#10 integrate
.. //depot/projects/netperf/sys/compat/ndis/ntoskrnl_var.h#4 integrate
.. //depot/projects/netperf/sys/compat/ndis/pe_var.h#4 integrate
.. //depot/projects/netperf/sys/compat/ndis/subr_hal.c#4 integrate
.. //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#9 integrate
.. //depot/projects/netperf/sys/dev/dpt/dpt_scsi.c#3 integrate
.. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#11 integrate
.. //depot/projects/netperf/sys/dev/usb/usb_quirks.c#4 integrate
.. //depot/projects/netperf/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/netperf/sys/dev/usb/usbdevs.h#13 integrate
.. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#13 integrate
.. //depot/projects/netperf/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/netperf/sys/fs/unionfs/union_vnops.c#5 integrate
.. //depot/projects/netperf/sys/kern/init_main.c#7 integrate
.. //depot/projects/netperf/sys/kern/kern_descrip.c#9 integrate
.. //depot/projects/netperf/sys/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/netperf/sys/modules/Makefile#15 integrate
.. //depot/projects/netperf/sys/powerpc/powermac/ata_macio.c#5 integrate
.. //depot/projects/netperf/sys/powerpc/psim/ata_iobus.c#4 integrate
.. //depot/projects/netperf/sys/sys/filedesc.h#4 integrate

Differences ...

==== //depot/projects/netperf/sys/Makefile#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/Makefile,v 1.28 2003/06/26 03:52:48 peter Exp $
+# $FreeBSD: src/sys/Makefile,v 1.29 2004/01/17 03:28:27 ru Exp $
 
 # The boot loader
 SUBDIR=	boot
 
-# KLD modules build for both a.out and ELF
+# Loadable kernel modules
 .if defined(MODULES_WITH_WORLD)
 SUBDIR+=modules
 .endif

==== //depot/projects/netperf/sys/compat/ndis/hal_var.h#2 (text+ko) ====

@@ -29,12 +29,20 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.2 2004/01/15 21:31:48 wpaul Exp $
  */
 
 #ifndef _HAL_VAR_H_
 #define _HAL_VAR_H_
 
+#ifdef __amd64__
+#define NDIS_BUS_SPACE_IO	AMD64_BUS_SPACE_IO
+#define NDIS_BUS_SPACE_MEM	AMD64_BUS_SPACE_MEM
+#else
+#define NDIS_BUS_SPACE_IO	I386_BUS_SPACE_IO
+#define NDIS_BUS_SPACE_MEM	I386_BUS_SPACE_MEM
+#endif
+
 extern image_patch_table hal_functbl[];
 
 #endif /* _HAL_VAR_H_ */

==== //depot/projects/netperf/sys/compat/ndis/ndis_var.h#10 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.15 2004/01/12 03:49:20 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.16 2004/01/16 02:07:04 obrien Exp $
  */
 
 #ifndef _NDIS_VAR_H_
@@ -46,7 +46,7 @@
 typedef void *ndis_handle;
 typedef uint32_t ndis_oid;
 typedef uint32_t ndis_error_code;
-typedef uint32_t ndis_kspin_lock;
+typedef register_t ndis_kspin_lock;
 typedef uint8_t ndis_kirql;
 
 /*

==== //depot/projects/netperf/sys/compat/ndis/ntoskrnl_var.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.4 2003/12/23 04:08:22 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.5 2004/01/16 02:07:04 obrien Exp $
  */
 
 #ifndef _NTOSKRNL_VAR_H_
@@ -55,7 +55,28 @@
 #define MDL_VA(b)						\
 	((void *)((char *)((b)->nb_startva) + (b)->nb_byteoffset))
 
-typedef uint32_t kspin_lock;
+/*-
+ * The ndis_kspin_lock type is called KSPIN_LOCK in MS-Windows.
+ * According to the Windows DDK header files, KSPIN_LOCK is defined like this:
+ *	typedef ULONG_PTR KSPIN_LOCK;
+ *
+ * From basetsd.h (SDK, Feb. 2003):
+ * 	typedef [public] unsigned __int3264 ULONG_PTR, *PULONG_PTR;
+ * 	typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;
+ * 	typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR;
+ * 
+ * The keyword __int3264 specifies an integral type that has the following
+ * properties:
+ *	+ It is 32-bit on 32-bit platforms
+ *	+ It is 64-bit on 64-bit platforms
+ *	+ It is 32-bit on the wire for backward compatibility.
+ *	  It gets truncated on the sending side and extended appropriately
+ *	  (signed or unsigned) on the receiving side.
+ *
+ * Thus register_t seems the proper mapping onto FreeBSD for spin locks.
+ */
+
+typedef register_t kspin_lock;
 
 struct slist_entry {
 	struct slist_entry	*sl_next;

==== //depot/projects/netperf/sys/compat/ndis/pe_var.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.4 2004/01/13 22:49:45 obrien Exp $
+ * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.6 2004/01/15 21:31:48 wpaul Exp $
  */
 
 #ifndef _PE_VAR_H_
@@ -417,9 +417,9 @@
  */
 
 #ifdef __amd64__
-#define __stdcall
+#define	__stdcall
 #else
-#define __stdcall __attribute__((__stdcall__))
+#define	__stdcall __attribute__((__stdcall__))
 #endif
 
 __BEGIN_DECLS

==== //depot/projects/netperf/sys/compat/ndis/subr_hal.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.6 2004/01/13 22:49:45 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.7 2004/01/15 19:34:56 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -96,7 +96,7 @@
 	uint32_t		*port;
 	uint32_t		val;
 {
-	bus_space_write_4(I386_BUS_SPACE_IO, 0x0, (uint32_t)port, val);
+	bus_space_write_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
@@ -105,7 +105,7 @@
 	uint16_t		*port;
 	uint16_t		val;
 {
-	bus_space_write_2(I386_BUS_SPACE_IO, 0x0, (uint32_t)port, val);
+	bus_space_write_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
@@ -114,7 +114,7 @@
 	uint8_t			*port;
 	uint8_t			val;
 {
-	bus_space_write_1(I386_BUS_SPACE_IO, 0x0, (uint32_t)port, val);
+	bus_space_write_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
@@ -124,7 +124,7 @@
 	uint32_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_write_multi_4(I386_BUS_SPACE_IO, 0x0,
+	bus_space_write_multi_4(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -135,7 +135,7 @@
 	uint16_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_write_multi_2(I386_BUS_SPACE_IO, 0x0,
+	bus_space_write_multi_2(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -146,7 +146,7 @@
 	uint8_t			*val;
 	uint32_t		cnt;
 {
-	bus_space_write_multi_1(I386_BUS_SPACE_IO, 0x0,
+	bus_space_write_multi_1(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -155,21 +155,21 @@
 hal_readport_ushort(port)
 	uint16_t		*port;
 {
-	return(bus_space_read_2(I386_BUS_SPACE_IO, 0x0, (uint32_t)port));
+	return(bus_space_read_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static uint32_t
 hal_readport_ulong(port)
 	uint32_t		*port;
 {
-	return(bus_space_read_4(I386_BUS_SPACE_IO, 0x0, (uint32_t)port));
+	return(bus_space_read_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static uint8_t
 hal_readport_uchar(port)
 	uint8_t			*port;
 {
-	return(bus_space_read_1(I386_BUS_SPACE_IO, 0x0, (uint32_t)port));
+	return(bus_space_read_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static void
@@ -178,7 +178,7 @@
 	uint32_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_read_multi_4(I386_BUS_SPACE_IO, 0x0,
+	bus_space_read_multi_4(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -189,7 +189,7 @@
 	uint16_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_read_multi_2(I386_BUS_SPACE_IO, 0x0,
+	bus_space_read_multi_2(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -200,7 +200,7 @@
 	uint8_t			*val;
 	uint32_t		cnt;
 {
-	bus_space_read_multi_1(I386_BUS_SPACE_IO, 0x0,
+	bus_space_read_multi_1(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }

==== //depot/projects/netperf/sys/compat/ndis/subr_ntoskrnl.c#9 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.15 2004/01/13 22:49:45 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.17 2004/01/15 21:31:48 wpaul Exp $");
 
 #include <sys/ctype.h>
 #include <sys/param.h>
@@ -56,6 +56,7 @@
 #include <sys/rman.h>
 
 #include <compat/ndis/pe_var.h>
+#include <compat/ndis/hal_var.h>
 #include <compat/ndis/resource_var.h>
 #include <compat/ndis/ndis_var.h>
 #include <compat/ndis/ntoskrnl_var.h>
@@ -282,7 +283,7 @@
 	uint16_t		*reg;
 	uint16_t		val;
 {
-	bus_space_write_2(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg, val);
+	bus_space_write_2(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
 	return;
 }
 
@@ -290,7 +291,7 @@
 ntoskrnl_readreg_ushort(reg)
 	uint16_t		*reg;
 {
-	return(bus_space_read_2(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg));
+	return(bus_space_read_2(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
 }
 
 __stdcall static void
@@ -298,7 +299,7 @@
 	uint32_t		*reg;
 	uint32_t		val;
 {
-	bus_space_write_4(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg, val);
+	bus_space_write_4(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
 	return;
 }
 
@@ -306,14 +307,14 @@
 ntoskrnl_readreg_ulong(reg)
 	uint32_t		*reg;
 {
-	return(bus_space_read_4(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg));
+	return(bus_space_read_4(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
 }
 
 __stdcall static uint8_t
 ntoskrnl_readreg_uchar(reg)
 	uint8_t			*reg;
 {
-	return(bus_space_read_1(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg));
+	return(bus_space_read_1(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
 }
 
 __stdcall static void
@@ -321,7 +322,7 @@
 	uint8_t			*reg;
 	uint8_t			val;
 {
-	bus_space_write_1(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg, val);
+	bus_space_write_1(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
 	return;
 }
 

==== //depot/projects/netperf/sys/dev/dpt/dpt_scsi.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.45 2003/08/24 17:46:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.46 2004/01/17 05:57:52 mdodd Exp $");
 
 /*
  * dpt_scsi.c: SCSI dependant code for the DPT driver
@@ -46,7 +46,7 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.45 2003/08/24 17:46:04 obrien Exp $"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.46 2004/01/17 05:57:52 mdodd Exp $"
 
 #define _DPT_C_
 
@@ -1553,8 +1553,19 @@
 		dpt->sims[i] = cam_sim_alloc(dpt_action, dpt_poll, "dpt",
 					     dpt, dpt->unit, /*untagged*/2,
 					     /*tagged*/dpt->max_dccbs, devq);
+		if (dpt->sims[i] == NULL) {
+			if (i == 0)
+				cam_simq_free(devq);
+			else
+				printf(	"%s(): Unable to attach bus %d "
+					"due to resource shortage\n",
+					__func__, i);
+			break;
+		}
+
 		if (xpt_bus_register(dpt->sims[i], i) != CAM_SUCCESS) {
 			cam_sim_free(dpt->sims[i], /*free_devq*/i == 0);
+			dpt->sims[i] = NULL;
 			break;
 		}
 
@@ -1564,6 +1575,7 @@
 				    CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
 			xpt_bus_deregister(cam_sim_path(dpt->sims[i]));
 			cam_sim_free(dpt->sims[i], /*free_devq*/i == 0);
+			dpt->sims[i] = NULL;
 			break;
 		}
 

==== //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.27 2004/01/12 21:04:43 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.28 2004/01/15 21:31:49 wpaul Exp $");
 
 #include "opt_bdg.h"
 
@@ -93,8 +93,6 @@
 	{ 0, 0, 0, NULL }
 };
 
-#define __stdcall __attribute__((__stdcall__))
-
 static int ndis_probe		(device_t);
 static int ndis_attach		(device_t);
 static int ndis_detach		(device_t);

==== //depot/projects/netperf/sys/dev/usb/usb_quirks.c#4 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.35 2004/01/13 21:42:31 green Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.36 2004/01/16 15:29:27 sanpei Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,6 +105,8 @@
  { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMRPAD,  ANY, { UQ_NO_STRINGS }},
  { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_CDMA_MSM,
 	ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX,
+	0x100, { UQ_ASSUME_CM_OVER_DATA }},
  { 0, 0, 0, { 0 } }
 };
 

==== //depot/projects/netperf/sys/dev/usb/usbdevs#13 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.156 2004/01/13 21:42:32 green Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.157 2004/01/16 15:29:27 sanpei Exp $
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -1184,9 +1184,10 @@
 
 /* SUN Corporation products */
 product	SUNTAC DS96L		0x0003	SUNTAC U-Cable type D2
-product	SUNTAC IS96U		0x000a	SUNTAC Ir-Trinity
 product SUNTAC PS64P1		0x0005	SUNTAC U-Cable type P1
 product SUNTAC VS10U		0x0009	SUNTAC Slipper U
+product	SUNTAC IS96U		0x000a	SUNTAC Ir-Trinity
+product	SUNTAC AS64LX		0x000b	SUNTAC U-Cable type A3
 
 /* Sun Microsystems products */
 product SUN KEYBOARD		0x0005	Type 6 USB keyboard

==== //depot/projects/netperf/sys/dev/usb/usbdevs.h#13 (text+ko) ====

@@ -1,10 +1,10 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.163 2004/01/13 21:42:32 green Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.164 2004/01/16 15:31:20 sanpei Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.155 2004/01/12 12:47:36 sanpei Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.157 2004/01/16 15:29:27 sanpei Exp 
  */
 
 /*
@@ -1191,9 +1191,10 @@
 
 /* SUN Corporation products */
 #define	USB_PRODUCT_SUNTAC_DS96L	0x0003		/* SUNTAC U-Cable type D2 */
-#define	USB_PRODUCT_SUNTAC_IS96U	0x000a		/* SUNTAC Ir-Trinity */
 #define	USB_PRODUCT_SUNTAC_PS64P1	0x0005		/* SUNTAC U-Cable type P1 */
 #define	USB_PRODUCT_SUNTAC_VS10U	0x0009		/* SUNTAC Slipper U */
+#define	USB_PRODUCT_SUNTAC_IS96U	0x000a		/* SUNTAC Ir-Trinity */
+#define	USB_PRODUCT_SUNTAC_AS64LX	0x000b		/* SUNTAC U-Cable type A3 */
 
 /* Sun Microsystems products */
 #define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB keyboard */

==== //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#13 (text+ko) ====

@@ -1,10 +1,10 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.163 2004/01/13 21:42:32 green Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.164 2004/01/16 15:31:20 sanpei Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.155 2004/01/12 12:47:36 sanpei Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.157 2004/01/16 15:29:27 sanpei Exp 
  */
 
 /*
@@ -2938,22 +2938,28 @@
 	    "SUNTAC U-Cable type D2",
 	},
 	{
-	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U,
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
+	    0,
+	    "SUN Corporation",
+	    "SUNTAC U-Cable type P1",
+	},
+	{
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
 	    0,
 	    "SUN Corporation",
-	    "SUNTAC Ir-Trinity",
+	    "SUNTAC Slipper U",
 	},
 	{
-	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U,
 	    0,
 	    "SUN Corporation",
-	    "SUNTAC U-Cable type P1",
+	    "SUNTAC Ir-Trinity",
 	},
 	{
-	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX,
 	    0,
 	    "SUN Corporation",
-	    "SUNTAC Slipper U",
+	    "SUNTAC U-Cable type A3",
 	},
 	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,

==== //depot/projects/netperf/sys/fs/unionfs/union_subr.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.75 2003/07/26 07:32:21 phk Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.77 2004/01/16 22:54:33 green Exp $
  */
 
 #include <sys/param.h>
@@ -1155,38 +1155,31 @@
 	return (VOP_CLOSE(vp, fmode, cred, td));
 }
 
-#if 0
-
 /*
  *	union_removed_upper:
  *
- *	called with union_node unlocked. XXX
+ *	An upper-only file/directory has been removed; un-cache it so
+ *	that unionfs vnode gets reclaimed and the last uppervp reference
+ *	disappears.
+ *
+ *	Called with union_node unlocked.
  */
 
 void
 union_removed_upper(un)
 	struct union_node *un;
 {
-	struct thread *td = curthread;	/* XXX */
-	struct vnode **vpp;
+	if (un->un_flags & UN_CACHED) {
+		int hash = UNION_HASH(un->un_uppervp, un->un_lowervp);
 
-	/*
-	 * Do not set the uppervp to NULLVP.  If lowervp is NULLVP,
-	 * union node will have neither uppervp nor lowervp.  We remove
-	 * the union node from cache, so that it will not be referrenced.
-	 */
-	union_newupper(un, NULLVP);
-	if (un->un_dircache != NULL)
-		union_dircache_free(un);
-
-	if (un->un_flags & UN_CACHED) {
+		while (union_list_lock(hash))
+			continue;
 		un->un_flags &= ~UN_CACHED;
 		LIST_REMOVE(un, un_cache);
+		union_list_unlock(hash);
 	}
 }
 
-#endif
-
 /*
  * Determine whether a whiteout is needed
  * during a remove/rmdir operation.

==== //depot/projects/netperf/sys/fs/unionfs/union_vnops.c#5 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.104 2004/01/03 00:36:46 tjr Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.106 2004/01/16 22:55:25 green Exp $
  */
 
 #include <sys/param.h>
@@ -1224,12 +1224,12 @@
 	if ((uppervp = union_lock_upper(un, td)) != NULLVP) {
 		if (union_dowhiteout(un, cnp->cn_cred, td))
 			cnp->cn_flags |= DOWHITEOUT;
-		error = VOP_REMOVE(upperdvp, uppervp, cnp);
-#if 0
-		/* XXX */
+		if (cnp->cn_flags & DOWHITEOUT)		/* XXX fs corruption */
+			error = EOPNOTSUPP;
+		else
+			error = VOP_REMOVE(upperdvp, uppervp, cnp);
 		if (!error)
 			union_removed_upper(un);
-#endif
 		union_unlock_upper(uppervp, td);
 	} else {
 		error = union_mkwhiteout(
@@ -1541,7 +1541,12 @@
 	if ((uppervp = union_lock_upper(un, td)) != NULLVP) {
 		if (union_dowhiteout(un, cnp->cn_cred, td))
 			cnp->cn_flags |= DOWHITEOUT;
-		error = VOP_RMDIR(upperdvp, uppervp, ap->a_cnp);
+		if (cnp->cn_flags & DOWHITEOUT)		/* XXX fs corruption */
+			error = EOPNOTSUPP;
+		else
+			error = VOP_RMDIR(upperdvp, uppervp, ap->a_cnp);
+		if (!error)
+			union_removed_upper(un);
 		union_unlock_upper(uppervp, td);
 	} else {
 		error = union_mkwhiteout(

==== //depot/projects/netperf/sys/kern/init_main.c#7 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.239 2004/01/15 10:15:03 des Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.240 2004/01/16 20:29:23 rwatson Exp $");
 
 #include "opt_init_path.h"
 #include "opt_mac.h"
@@ -683,6 +683,7 @@
 	error = fork1(&thread0, RFFDG | RFPROC | RFSTOPPED, 0, &initproc);
 	if (error)
 		panic("cannot fork init: %d\n", error);
+	KASSERT(initproc->p_pid == 1, ("create_init: initproc->p_pid != 1"));
 	/* divorce init's credentials from the kernel's */
 	newcred = crget();
 	PROC_LOCK(initproc);

==== //depot/projects/netperf/sys/kern/kern_descrip.c#9 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.219 2004/01/15 10:15:03 des Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.223 2004/01/17 00:58:36 des Exp $");
 
 #include "opt_compat.h"
 
@@ -599,12 +599,10 @@
 	if (type == DUP_FIXED) {
 		if (new >= fdp->fd_nfiles)
 			fdgrowtable(fdp, new + 1);
-		KASSERT(new < fdp->fd_nfiles,
-		    ("fdgrowtable() failed to grow table"));
 		if (fdp->fd_ofiles[new] == NULL)
 			fdused(fdp, new);
 	} else {
-		if ((error = fdalloc(td, &new)) != 0) {
+		if ((error = fdalloc(td, new, &new)) != 0) {
 			FILEDESC_UNLOCK(fdp);
 			fdrop(fp, td);
 			return (error);
@@ -1207,7 +1205,7 @@
  * Allocate a file descriptor for the process.
  */
 int
-fdalloc(struct thread *td, int *result)
+fdalloc(struct thread *td, int minfd, int *result)
 {
 	struct proc *p = td->td_proc;
 	struct filedesc *fdp = p->p_fd;
@@ -1224,14 +1222,13 @@
 	 * may drop the filedesc lock, so we're in a race.
 	 */
 	for (;;) {
-		fd = fd_first_free(fdp, fdp->fd_freefile, fdp->fd_nfiles);
+		fd = fd_first_free(fdp, minfd, fdp->fd_nfiles);
 		if (fd >= maxfd)
 			return (EMFILE);
 		if (fd < fdp->fd_nfiles)
 			break;
 		fdgrowtable(fdp, min(fdp->fd_nfiles * 2, maxfd));
 	}
-	FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
 
 	/*
 	 * Perform some sanity checks, then mark the file descriptor as
@@ -1329,7 +1326,7 @@
 		LIST_INSERT_HEAD(&filehead, fp, f_list);
 	}
 	sx_xunlock(&filelist_lock);
-	if ((error = fdalloc(td, &i))) {
+	if ((error = fdalloc(td, 0, &i))) {
 		FILEDESC_UNLOCK(p->p_fd);
 		fdrop(fp, td);
 		if (resultfp)
@@ -1374,8 +1371,10 @@
 
 	FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
 
+	FILEDESC_UNLOCK(fdp);
 	MALLOC(newfdp, struct filedesc0 *, sizeof(struct filedesc0),
 	    M_FILEDESC, M_WAITOK | M_ZERO);
+	FILEDESC_LOCK(fdp);
 	mtx_init(&newfdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF);
 	newfdp->fd_fd.fd_cdir = fdp->fd_cdir;
 	if (newfdp->fd_fd.fd_cdir)
@@ -1429,11 +1428,13 @@
 
 	FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
 	newfdp = fdinit(fdp);
-	FILEDESC_LOCK(newfdp);
-	if (fdp->fd_lastfile >= newfdp->fd_nfiles)
+	while (fdp->fd_lastfile >= newfdp->fd_nfiles) {
+		FILEDESC_UNLOCK(fdp);
+		FILEDESC_LOCK(newfdp);
 		fdgrowtable(newfdp, fdp->fd_lastfile + 1);
-	KASSERT(newfdp->fd_nfiles > fdp->fd_lastfile,
-	    ("fdgrowtable() failed to grow table"));
+		FILEDESC_UNLOCK(newfdp);
+		FILEDESC_LOCK(fdp);
+	}
 	/* copy everything except kqueue descriptors */
 	newfdp->fd_freefile = -1;
 	for (i = 0; i <= fdp->fd_lastfile; ++i) {
@@ -1441,7 +1442,6 @@
 		    fdp->fd_ofiles[i]->f_type != DTYPE_KQUEUE) {
 			newfdp->fd_ofiles[i] = fdp->fd_ofiles[i];
 			newfdp->fd_ofileflags[i] = fdp->fd_ofileflags[i];
-			fdused(newfdp, i);
 			fhold(newfdp->fd_ofiles[i]);
 			newfdp->fd_lastfile = i;
 		} else {
@@ -1449,10 +1449,16 @@
 				newfdp->fd_freefile = i;
 		}
 	}
+	FILEDESC_UNLOCK(fdp);
+	FILEDESC_LOCK(newfdp);
+	for (i = 0; i <= newfdp->fd_lastfile; ++i)
+		if (newfdp->fd_ofiles[i] != NULL)
+			fdused(newfdp, i);
+	FILEDESC_UNLOCK(newfdp);
+	FILEDESC_LOCK(fdp);
 	if (newfdp->fd_freefile == -1)
 		newfdp->fd_freefile = i;
 	newfdp->fd_cmask = fdp->fd_cmask;
-	FILEDESC_UNLOCK(newfdp);
 	return (newfdp);
 }
 

==== //depot/projects/netperf/sys/kern/uipc_usrreq.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.114 2004/01/15 10:15:03 des Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.115 2004/01/17 00:59:04 des Exp $");
 
 #include "opt_mac.h"
 
@@ -1047,7 +1047,7 @@
 			fdp = (int *)
 			    CMSG_DATA(mtod(*controlp, struct cmsghdr *));
 			for (i = 0; i < newfds; i++) {
-				if (fdalloc(td, &f))
+				if (fdalloc(td, 0, &f))
 					panic("unp_externalize fdalloc failed");
 				fp = *rp++;
 				td->td_proc->p_fd->fd_ofiles[f] = fp;

==== //depot/projects/netperf/sys/modules/Makefile#15 (text+ko) ====

@@ -1,33 +1,49 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.363 2004/01/11 09:15:13 nyan Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.364 2004/01/16 15:55:29 ru Exp $
 
-.if !defined(NOCRYPT) || defined(ALL_MODULES)
-.if exists(${.CURDIR}/../opencrypto)
-_crypto=	crypto
-_cryptodev=	cryptodev
-.endif
-.if exists(${.CURDIR}/../crypto)
-_random=	random
-.endif
-.endif
+# pcic -- currently broken and being worked on out of tree.
+# oldcard -- specialized use for debugging only.
+# owi -- totally unsupported for debugging only.
 
-SUBDIR=	accf_data \
+SUBDIR=	${_3dfx} \
+	${_aac} \
+	accf_data \
 	accf_http \
+	${_acpi} \
+	${_agp} \
 	aha \
+	${_aic} \
 	aic7xxx \
 	aio \
+	${_amd} \
 	amr \
 	an \
+	${_aout} \
+	${_apm} \
+	${_ar} \
+	${_arcnet} \
+	${_asr} \
 	ath \
+	${_ath_hal} \
 	aue \
+	${_awi} \
 	axe \
 	bfe \
 	bge \
+	${_bios} \
+	${_bktr} \
 	bridge \
 	cam \
+	${_canbepm} \
+	${_canbus} \
+	${_cardbus} \
+	${_cbb} \
 	cd9660 \
 	cd9660_iconv \
+	${_ciss} \
+	${_cm} \
 	coda \
 	coda5 \
+	${_coff} \
 	${_crypto} \
 	${_cryptodev} \
 	cue \
@@ -36,18 +52,37 @@
 	dcons_crom \
 	de \
 	digi \
+	${_dpt} \
+	${_drm} \
 	dummynet \
+	${_ed} \
+	${_el} \
+	${_elink} \
+	${_em} \
 	en \
+	${_ep} \
+	${_ex} \
+	${_exca} \
+	${_ext2fs} \
 	fatm \
 	fdc \
 	fdescfs \
+	${_fe} \
 	firewire \
 	fxp \
+	${_gem} \
 	geom \
 	gx \
 	harp \
 	hatm \
+	${_hfa} \
 	hifn \
+	${_hme} \
+	${_i2c} \
+	${_ibcs2} \
+	${_ida} \
+	${_idt} \
+	${_ie} \
 	if_disc \
 	if_ef \
 	if_faith \
@@ -59,9 +94,12 @@
 	if_tap \
 	if_tun \
 	if_vlan \
+	${_iir} \
 	ip6fw \
+	${_ipfilter} \
+	ipfw \
 	ip_mroute_mod \
-	ipfw \
+	${_ips} \
 	isp \
 	ispfw \
 	joy \
@@ -70,6 +108,9 @@
 	libiconv \
 	libmbpool \
 	libmchain \
+	${_linprocfs} \
+	${_linux} \
+	${_lnc} \
 	lpt \
 	mac_biba \
 	mac_bsdextended \
@@ -86,20 +127,34 @@
 	md \
 	mii \
 	mlx \
+	${_mly} \
 	mpt \
 	msdosfs \
 	msdosfs_iconv \
 	my \
+	${_ncp} \
+	${_ncv} \
+	${_ndis} \
+	${_netgraph} \
 	nfsclient \
 	nfsserver \
 	nge \
 	nmdm \
+	${_nsp} \
 	ntfs \
 	ntfs_iconv \
+	${_null} \
 	nullfs \
+	${_nwfs} \
+	${_oltr} \
+	${_osf1} \
 	patm \
+	${_pccard} \
+	${_pcfclock} \
 	pcn \
+	${_pecoff} \
 	plip \
+	${_pmc} \
 	portalfs \
 	ppbus \
 	ppi \
@@ -109,21 +164,36 @@
 	pst \
 	raidframe \
 	${_random} \
+	${_ray} \
 	rc \
 	rc4 \
 	re \
 	rl \
 	rp \
 	rue \
+	${_s3} \
+	${_safe} \
+	${_sbni} \
 	sbsh \
 	scd \
+	${_scsi_low} \
 	sf \
 	sis \
 	sk \
+	${_smbfs} \
 	sn \
+	${_snc} \
 	snp \
+	${_sound} \
+	${_speaker} \
+	${_splash} \
+	${_sppp} \
+	${_sr} \
 	ste \
+	${_stg} \
+	${_streams} \
 	sym \
+	${_syscons} \
 	sysvipc \
 	ti \
 	tl \
@@ -139,6 +209,7 @@
 	udf \
 	udf_iconv \

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Jan 16 23:27:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8728516A4D0; Fri, 16 Jan 2004 23:27:03 -0800 (PST)
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 61EFC16A4CE
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 23:27:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 456E843D49
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 23:27:00 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0H7R00B000885
	for <perforce@freebsd.org>; Fri, 16 Jan 2004 23:27:00 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0H7QxmE000882
	for perforce@freebsd.org; Fri, 16 Jan 2004 23:26:59 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Date: Fri, 16 Jan 2004 23:26:59 -0800 (PST)
Message-Id: <200401170726.i0H7QxmE000882@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45481 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: Sat, 17 Jan 2004 07:27:04 -0000

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

Change 45481 by scottl@scottl-netperf on 2004/01/16 23:26:59

	IFC @45479

Affected files ...

.. //depot/projects/netperf+sockets/sys/Makefile#2 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/hal_var.h#2 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#10 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#4 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/pe_var.h#4 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/subr_hal.c#4 integrate
.. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#9 integrate
.. //depot/projects/netperf+sockets/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#11 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#8 integrate
.. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#8 integrate
.. //depot/projects/netperf+sockets/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/netperf+sockets/sys/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/netperf+sockets/sys/kern/init_main.c#3 integrate
.. //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#8 integrate
.. //depot/projects/netperf+sockets/sys/modules/Makefile#6 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/netperf+sockets/sys/powerpc/psim/ata_iobus.c#3 integrate
.. //depot/projects/netperf+sockets/sys/sys/filedesc.h#4 integrate

Differences ...

==== //depot/projects/netperf+sockets/sys/Makefile#2 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/Makefile,v 1.28 2003/06/26 03:52:48 peter Exp $
+# $FreeBSD: src/sys/Makefile,v 1.29 2004/01/17 03:28:27 ru Exp $
 
 # The boot loader
 SUBDIR=	boot
 
-# KLD modules build for both a.out and ELF
+# Loadable kernel modules
 .if defined(MODULES_WITH_WORLD)
 SUBDIR+=modules
 .endif

==== //depot/projects/netperf+sockets/sys/compat/ndis/hal_var.h#2 (text+ko) ====

@@ -29,12 +29,20 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.2 2004/01/15 21:31:48 wpaul Exp $
  */
 
 #ifndef _HAL_VAR_H_
 #define _HAL_VAR_H_
 
+#ifdef __amd64__
+#define NDIS_BUS_SPACE_IO	AMD64_BUS_SPACE_IO
+#define NDIS_BUS_SPACE_MEM	AMD64_BUS_SPACE_MEM
+#else
+#define NDIS_BUS_SPACE_IO	I386_BUS_SPACE_IO
+#define NDIS_BUS_SPACE_MEM	I386_BUS_SPACE_MEM
+#endif
+
 extern image_patch_table hal_functbl[];
 
 #endif /* _HAL_VAR_H_ */

==== //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#10 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.15 2004/01/12 03:49:20 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.16 2004/01/16 02:07:04 obrien Exp $
  */
 
 #ifndef _NDIS_VAR_H_
@@ -46,7 +46,7 @@
 typedef void *ndis_handle;
 typedef uint32_t ndis_oid;
 typedef uint32_t ndis_error_code;
-typedef uint32_t ndis_kspin_lock;
+typedef register_t ndis_kspin_lock;
 typedef uint8_t ndis_kirql;
 
 /*

==== //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.4 2003/12/23 04:08:22 wpaul Exp $
+ * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.5 2004/01/16 02:07:04 obrien Exp $
  */
 
 #ifndef _NTOSKRNL_VAR_H_
@@ -55,7 +55,28 @@
 #define MDL_VA(b)						\
 	((void *)((char *)((b)->nb_startva) + (b)->nb_byteoffset))
 
-typedef uint32_t kspin_lock;
+/*-
+ * The ndis_kspin_lock type is called KSPIN_LOCK in MS-Windows.
+ * According to the Windows DDK header files, KSPIN_LOCK is defined like this:
+ *	typedef ULONG_PTR KSPIN_LOCK;
+ *
+ * From basetsd.h (SDK, Feb. 2003):
+ * 	typedef [public] unsigned __int3264 ULONG_PTR, *PULONG_PTR;
+ * 	typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;
+ * 	typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR;
+ * 
+ * The keyword __int3264 specifies an integral type that has the following
+ * properties:
+ *	+ It is 32-bit on 32-bit platforms
+ *	+ It is 64-bit on 64-bit platforms
+ *	+ It is 32-bit on the wire for backward compatibility.
+ *	  It gets truncated on the sending side and extended appropriately
+ *	  (signed or unsigned) on the receiving side.
+ *
+ * Thus register_t seems the proper mapping onto FreeBSD for spin locks.
+ */
+
+typedef register_t kspin_lock;
 
 struct slist_entry {
 	struct slist_entry	*sl_next;

==== //depot/projects/netperf+sockets/sys/compat/ndis/pe_var.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.4 2004/01/13 22:49:45 obrien Exp $
+ * $FreeBSD: src/sys/compat/ndis/pe_var.h,v 1.6 2004/01/15 21:31:48 wpaul Exp $
  */
 
 #ifndef _PE_VAR_H_
@@ -417,9 +417,9 @@
  */
 
 #ifdef __amd64__
-#define __stdcall
+#define	__stdcall
 #else
-#define __stdcall __attribute__((__stdcall__))
+#define	__stdcall __attribute__((__stdcall__))
 #endif
 
 __BEGIN_DECLS

==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_hal.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.6 2004/01/13 22:49:45 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.7 2004/01/15 19:34:56 obrien Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -96,7 +96,7 @@
 	uint32_t		*port;
 	uint32_t		val;
 {
-	bus_space_write_4(I386_BUS_SPACE_IO, 0x0, (uint32_t)port, val);
+	bus_space_write_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
@@ -105,7 +105,7 @@
 	uint16_t		*port;
 	uint16_t		val;
 {
-	bus_space_write_2(I386_BUS_SPACE_IO, 0x0, (uint32_t)port, val);
+	bus_space_write_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
@@ -114,7 +114,7 @@
 	uint8_t			*port;
 	uint8_t			val;
 {
-	bus_space_write_1(I386_BUS_SPACE_IO, 0x0, (uint32_t)port, val);
+	bus_space_write_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
@@ -124,7 +124,7 @@
 	uint32_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_write_multi_4(I386_BUS_SPACE_IO, 0x0,
+	bus_space_write_multi_4(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -135,7 +135,7 @@
 	uint16_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_write_multi_2(I386_BUS_SPACE_IO, 0x0,
+	bus_space_write_multi_2(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -146,7 +146,7 @@
 	uint8_t			*val;
 	uint32_t		cnt;
 {
-	bus_space_write_multi_1(I386_BUS_SPACE_IO, 0x0,
+	bus_space_write_multi_1(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -155,21 +155,21 @@
 hal_readport_ushort(port)
 	uint16_t		*port;
 {
-	return(bus_space_read_2(I386_BUS_SPACE_IO, 0x0, (uint32_t)port));
+	return(bus_space_read_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static uint32_t
 hal_readport_ulong(port)
 	uint32_t		*port;
 {
-	return(bus_space_read_4(I386_BUS_SPACE_IO, 0x0, (uint32_t)port));
+	return(bus_space_read_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static uint8_t
 hal_readport_uchar(port)
 	uint8_t			*port;
 {
-	return(bus_space_read_1(I386_BUS_SPACE_IO, 0x0, (uint32_t)port));
+	return(bus_space_read_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static void
@@ -178,7 +178,7 @@
 	uint32_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_read_multi_4(I386_BUS_SPACE_IO, 0x0,
+	bus_space_read_multi_4(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -189,7 +189,7 @@
 	uint16_t		*val;
 	uint32_t		cnt;
 {
-	bus_space_read_multi_2(I386_BUS_SPACE_IO, 0x0,
+	bus_space_read_multi_2(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }
@@ -200,7 +200,7 @@
 	uint8_t			*val;
 	uint32_t		cnt;
 {
-	bus_space_read_multi_1(I386_BUS_SPACE_IO, 0x0,
+	bus_space_read_multi_1(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
 	return;
 }

==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#9 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.15 2004/01/13 22:49:45 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.17 2004/01/15 21:31:48 wpaul Exp $");
 
 #include <sys/ctype.h>
 #include <sys/param.h>
@@ -56,6 +56,7 @@
 #include <sys/rman.h>
 
 #include <compat/ndis/pe_var.h>
+#include <compat/ndis/hal_var.h>
 #include <compat/ndis/resource_var.h>
 #include <compat/ndis/ndis_var.h>
 #include <compat/ndis/ntoskrnl_var.h>
@@ -282,7 +283,7 @@
 	uint16_t		*reg;
 	uint16_t		val;
 {
-	bus_space_write_2(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg, val);
+	bus_space_write_2(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
 	return;
 }
 
@@ -290,7 +291,7 @@
 ntoskrnl_readreg_ushort(reg)
 	uint16_t		*reg;
 {
-	return(bus_space_read_2(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg));
+	return(bus_space_read_2(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
 }
 
 __stdcall static void
@@ -298,7 +299,7 @@
 	uint32_t		*reg;
 	uint32_t		val;
 {
-	bus_space_write_4(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg, val);
+	bus_space_write_4(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
 	return;
 }
 
@@ -306,14 +307,14 @@
 ntoskrnl_readreg_ulong(reg)
 	uint32_t		*reg;
 {
-	return(bus_space_read_4(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg));
+	return(bus_space_read_4(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
 }
 
 __stdcall static uint8_t
 ntoskrnl_readreg_uchar(reg)
 	uint8_t			*reg;
 {
-	return(bus_space_read_1(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg));
+	return(bus_space_read_1(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg));
 }
 
 __stdcall static void
@@ -321,7 +322,7 @@
 	uint8_t			*reg;
 	uint8_t			val;
 {
-	bus_space_write_1(I386_BUS_SPACE_MEM, 0x0, (uint32_t)reg, val);
+	bus_space_write_1(NDIS_BUS_SPACE_MEM, 0x0, (bus_size_t)reg, val);
 	return;
 }
 

==== //depot/projects/netperf+sockets/sys/dev/dpt/dpt_scsi.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.45 2003/08/24 17:46:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.46 2004/01/17 05:57:52 mdodd Exp $");
 
 /*
  * dpt_scsi.c: SCSI dependant code for the DPT driver
@@ -46,7 +46,7 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.45 2003/08/24 17:46:04 obrien Exp $"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.46 2004/01/17 05:57:52 mdodd Exp $"
 
 #define _DPT_C_
 
@@ -1553,8 +1553,19 @@
 		dpt->sims[i] = cam_sim_alloc(dpt_action, dpt_poll, "dpt",
 					     dpt, dpt->unit, /*untagged*/2,
 					     /*tagged*/dpt->max_dccbs, devq);
+		if (dpt->sims[i] == NULL) {
+			if (i == 0)
+				cam_simq_free(devq);
+			else
+				printf(	"%s(): Unable to attach bus %d "
+					"due to resource shortage\n",
+					__func__, i);
+			break;
+		}
+
 		if (xpt_bus_register(dpt->sims[i], i) != CAM_SUCCESS) {
 			cam_sim_free(dpt->sims[i], /*free_devq*/i == 0);
+			dpt->sims[i] = NULL;
 			break;
 		}
 
@@ -1564,6 +1575,7 @@
 				    CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
 			xpt_bus_deregister(cam_sim_path(dpt->sims[i]));
 			cam_sim_free(dpt->sims[i], /*free_devq*/i == 0);
+			dpt->sims[i] = NULL;
 			break;
 		}
 

==== //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.27 2004/01/12 21:04:43 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.28 2004/01/15 21:31:49 wpaul Exp $");
 
 #include "opt_bdg.h"
 
@@ -93,8 +93,6 @@
 	{ 0, 0, 0, NULL }
 };
 
-#define __stdcall __attribute__((__stdcall__))
-
 static int ndis_probe		(device_t);
 static int ndis_attach		(device_t);
 static int ndis_detach		(device_t);

==== //depot/projects/netperf+sockets/sys/dev/usb/usb_quirks.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.35 2004/01/13 21:42:31 green Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.36 2004/01/16 15:29:27 sanpei Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,6 +105,8 @@
  { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMRPAD,  ANY, { UQ_NO_STRINGS }},
  { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_CDMA_MSM,
 	ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX,
+	0x100, { UQ_ASSUME_CM_OVER_DATA }},
  { 0, 0, 0, { 0 } }
 };
 

==== //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#8 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.156 2004/01/13 21:42:32 green Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.157 2004/01/16 15:29:27 sanpei Exp $
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -1184,9 +1184,10 @@
 
 /* SUN Corporation products */
 product	SUNTAC DS96L		0x0003	SUNTAC U-Cable type D2
-product	SUNTAC IS96U		0x000a	SUNTAC Ir-Trinity
 product SUNTAC PS64P1		0x0005	SUNTAC U-Cable type P1
 product SUNTAC VS10U		0x0009	SUNTAC Slipper U
+product	SUNTAC IS96U		0x000a	SUNTAC Ir-Trinity
+product	SUNTAC AS64LX		0x000b	SUNTAC U-Cable type A3
 
 /* Sun Microsystems products */
 product SUN KEYBOARD		0x0005	Type 6 USB keyboard

==== //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#8 (text+ko) ====

@@ -1,10 +1,10 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.163 2004/01/13 21:42:32 green Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.164 2004/01/16 15:31:20 sanpei Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.155 2004/01/12 12:47:36 sanpei Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.157 2004/01/16 15:29:27 sanpei Exp 
  */
 
 /*
@@ -1191,9 +1191,10 @@
 
 /* SUN Corporation products */
 #define	USB_PRODUCT_SUNTAC_DS96L	0x0003		/* SUNTAC U-Cable type D2 */
-#define	USB_PRODUCT_SUNTAC_IS96U	0x000a		/* SUNTAC Ir-Trinity */
 #define	USB_PRODUCT_SUNTAC_PS64P1	0x0005		/* SUNTAC U-Cable type P1 */
 #define	USB_PRODUCT_SUNTAC_VS10U	0x0009		/* SUNTAC Slipper U */
+#define	USB_PRODUCT_SUNTAC_IS96U	0x000a		/* SUNTAC Ir-Trinity */
+#define	USB_PRODUCT_SUNTAC_AS64LX	0x000b		/* SUNTAC U-Cable type A3 */
 
 /* Sun Microsystems products */
 #define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB keyboard */

==== //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#8 (text+ko) ====

@@ -1,10 +1,10 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.163 2004/01/13 21:42:32 green Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.164 2004/01/16 15:31:20 sanpei Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.155 2004/01/12 12:47:36 sanpei Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.157 2004/01/16 15:29:27 sanpei Exp 
  */
 
 /*
@@ -2938,22 +2938,28 @@
 	    "SUNTAC U-Cable type D2",
 	},
 	{
-	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U,
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
+	    0,
+	    "SUN Corporation",
+	    "SUNTAC U-Cable type P1",
+	},
+	{
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
 	    0,
 	    "SUN Corporation",
-	    "SUNTAC Ir-Trinity",
+	    "SUNTAC Slipper U",
 	},
 	{
-	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U,
 	    0,
 	    "SUN Corporation",
-	    "SUNTAC U-Cable type P1",
+	    "SUNTAC Ir-Trinity",
 	},
 	{
-	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX,
 	    0,
 	    "SUN Corporation",
-	    "SUNTAC Slipper U",
+	    "SUNTAC U-Cable type A3",
 	},
 	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,

==== //depot/projects/netperf+sockets/sys/fs/unionfs/union_subr.c#2 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.75 2003/07/26 07:32:21 phk Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.77 2004/01/16 22:54:33 green Exp $
  */
 
 #include <sys/param.h>
@@ -1155,38 +1155,31 @@
 	return (VOP_CLOSE(vp, fmode, cred, td));
 }
 
-#if 0
-
 /*
  *	union_removed_upper:
  *
- *	called with union_node unlocked. XXX
+ *	An upper-only file/directory has been removed; un-cache it so
+ *	that unionfs vnode gets reclaimed and the last uppervp reference
+ *	disappears.
+ *
+ *	Called with union_node unlocked.
  */
 
 void
 union_removed_upper(un)
 	struct union_node *un;
 {
-	struct thread *td = curthread;	/* XXX */
-	struct vnode **vpp;
+	if (un->un_flags & UN_CACHED) {
+		int hash = UNION_HASH(un->un_uppervp, un->un_lowervp);
 
-	/*
-	 * Do not set the uppervp to NULLVP.  If lowervp is NULLVP,
-	 * union node will have neither uppervp nor lowervp.  We remove
-	 * the union node from cache, so that it will not be referrenced.
-	 */
-	union_newupper(un, NULLVP);
-	if (un->un_dircache != NULL)
-		union_dircache_free(un);
-
-	if (un->un_flags & UN_CACHED) {
+		while (union_list_lock(hash))
+			continue;
 		un->un_flags &= ~UN_CACHED;
 		LIST_REMOVE(un, un_cache);
+		union_list_unlock(hash);
 	}
 }
 
-#endif
-
 /*
  * Determine whether a whiteout is needed
  * during a remove/rmdir operation.

==== //depot/projects/netperf+sockets/sys/fs/unionfs/union_vnops.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.104 2004/01/03 00:36:46 tjr Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.106 2004/01/16 22:55:25 green Exp $
  */
 
 #include <sys/param.h>
@@ -1224,12 +1224,12 @@
 	if ((uppervp = union_lock_upper(un, td)) != NULLVP) {
 		if (union_dowhiteout(un, cnp->cn_cred, td))
 			cnp->cn_flags |= DOWHITEOUT;
-		error = VOP_REMOVE(upperdvp, uppervp, cnp);
-#if 0
-		/* XXX */
+		if (cnp->cn_flags & DOWHITEOUT)		/* XXX fs corruption */
+			error = EOPNOTSUPP;
+		else
+			error = VOP_REMOVE(upperdvp, uppervp, cnp);
 		if (!error)
 			union_removed_upper(un);
-#endif
 		union_unlock_upper(uppervp, td);
 	} else {
 		error = union_mkwhiteout(
@@ -1541,7 +1541,12 @@
 	if ((uppervp = union_lock_upper(un, td)) != NULLVP) {
 		if (union_dowhiteout(un, cnp->cn_cred, td))
 			cnp->cn_flags |= DOWHITEOUT;
-		error = VOP_RMDIR(upperdvp, uppervp, ap->a_cnp);
+		if (cnp->cn_flags & DOWHITEOUT)		/* XXX fs corruption */
+			error = EOPNOTSUPP;
+		else
+			error = VOP_RMDIR(upperdvp, uppervp, ap->a_cnp);
+		if (!error)
+			union_removed_upper(un);
 		union_unlock_upper(uppervp, td);
 	} else {
 		error = union_mkwhiteout(

==== //depot/projects/netperf+sockets/sys/kern/init_main.c#3 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.239 2004/01/15 10:15:03 des Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.240 2004/01/16 20:29:23 rwatson Exp $");
 
 #include "opt_init_path.h"
 #include "opt_mac.h"
@@ -683,6 +683,7 @@
 	error = fork1(&thread0, RFFDG | RFPROC | RFSTOPPED, 0, &initproc);
 	if (error)
 		panic("cannot fork init: %d\n", error);
+	KASSERT(initproc->p_pid == 1, ("create_init: initproc->p_pid != 1"));
 	/* divorce init's credentials from the kernel's */
 	newcred = crget();
 	PROC_LOCK(initproc);

==== //depot/projects/netperf+sockets/sys/kern/kern_descrip.c#5 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.219 2004/01/15 10:15:03 des Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.223 2004/01/17 00:58:36 des Exp $");
 
 #include "opt_compat.h"
 
@@ -599,12 +599,10 @@
 	if (type == DUP_FIXED) {
 		if (new >= fdp->fd_nfiles)
 			fdgrowtable(fdp, new + 1);
-		KASSERT(new < fdp->fd_nfiles,
-		    ("fdgrowtable() failed to grow table"));
 		if (fdp->fd_ofiles[new] == NULL)
 			fdused(fdp, new);
 	} else {
-		if ((error = fdalloc(td, &new)) != 0) {
+		if ((error = fdalloc(td, new, &new)) != 0) {
 			FILEDESC_UNLOCK(fdp);
 			fdrop(fp, td);
 			return (error);
@@ -1207,7 +1205,7 @@
  * Allocate a file descriptor for the process.
  */
 int
-fdalloc(struct thread *td, int *result)
+fdalloc(struct thread *td, int minfd, int *result)
 {
 	struct proc *p = td->td_proc;
 	struct filedesc *fdp = p->p_fd;
@@ -1224,14 +1222,13 @@
 	 * may drop the filedesc lock, so we're in a race.
 	 */
 	for (;;) {
-		fd = fd_first_free(fdp, fdp->fd_freefile, fdp->fd_nfiles);
+		fd = fd_first_free(fdp, minfd, fdp->fd_nfiles);
 		if (fd >= maxfd)
 			return (EMFILE);
 		if (fd < fdp->fd_nfiles)
 			break;
 		fdgrowtable(fdp, min(fdp->fd_nfiles * 2, maxfd));
 	}
-	FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
 
 	/*
 	 * Perform some sanity checks, then mark the file descriptor as
@@ -1329,7 +1326,7 @@
 		LIST_INSERT_HEAD(&filehead, fp, f_list);
 	}
 	sx_xunlock(&filelist_lock);
-	if ((error = fdalloc(td, &i))) {
+	if ((error = fdalloc(td, 0, &i))) {
 		FILEDESC_UNLOCK(p->p_fd);
 		fdrop(fp, td);
 		if (resultfp)
@@ -1374,8 +1371,10 @@
 
 	FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
 
+	FILEDESC_UNLOCK(fdp);
 	MALLOC(newfdp, struct filedesc0 *, sizeof(struct filedesc0),
 	    M_FILEDESC, M_WAITOK | M_ZERO);
+	FILEDESC_LOCK(fdp);
 	mtx_init(&newfdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF);
 	newfdp->fd_fd.fd_cdir = fdp->fd_cdir;
 	if (newfdp->fd_fd.fd_cdir)
@@ -1429,11 +1428,13 @@
 
 	FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
 	newfdp = fdinit(fdp);
-	FILEDESC_LOCK(newfdp);
-	if (fdp->fd_lastfile >= newfdp->fd_nfiles)
+	while (fdp->fd_lastfile >= newfdp->fd_nfiles) {
+		FILEDESC_UNLOCK(fdp);
+		FILEDESC_LOCK(newfdp);
 		fdgrowtable(newfdp, fdp->fd_lastfile + 1);
-	KASSERT(newfdp->fd_nfiles > fdp->fd_lastfile,
-	    ("fdgrowtable() failed to grow table"));
+		FILEDESC_UNLOCK(newfdp);
+		FILEDESC_LOCK(fdp);
+	}
 	/* copy everything except kqueue descriptors */
 	newfdp->fd_freefile = -1;
 	for (i = 0; i <= fdp->fd_lastfile; ++i) {
@@ -1441,7 +1442,6 @@
 		    fdp->fd_ofiles[i]->f_type != DTYPE_KQUEUE) {
 			newfdp->fd_ofiles[i] = fdp->fd_ofiles[i];
 			newfdp->fd_ofileflags[i] = fdp->fd_ofileflags[i];
-			fdused(newfdp, i);
 			fhold(newfdp->fd_ofiles[i]);
 			newfdp->fd_lastfile = i;
 		} else {
@@ -1449,10 +1449,16 @@
 				newfdp->fd_freefile = i;
 		}
 	}
+	FILEDESC_UNLOCK(fdp);
+	FILEDESC_LOCK(newfdp);
+	for (i = 0; i <= newfdp->fd_lastfile; ++i)
+		if (newfdp->fd_ofiles[i] != NULL)
+			fdused(newfdp, i);
+	FILEDESC_UNLOCK(newfdp);
+	FILEDESC_LOCK(fdp);
 	if (newfdp->fd_freefile == -1)
 		newfdp->fd_freefile = i;
 	newfdp->fd_cmask = fdp->fd_cmask;
-	FILEDESC_UNLOCK(newfdp);
 	return (newfdp);
 }
 

==== //depot/projects/netperf+sockets/sys/kern/uipc_usrreq.c#8 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.112 2003/11/18 00:39:03 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.115 2004/01/17 00:59:04 des Exp $");
 
 #include "opt_mac.h"
 
@@ -1204,7 +1204,7 @@
 			fdp = (int *)
 			    CMSG_DATA(mtod(*controlp, struct cmsghdr *));
 			for (i = 0; i < newfds; i++) {
-				if (fdalloc(td, &f))
+				if (fdalloc(td, 0, &f))
 					panic("unp_externalize fdalloc failed");
 				fp = *rp++;
 				td->td_proc->p_fd->fd_ofiles[f] = fp;

==== //depot/projects/netperf+sockets/sys/modules/Makefile#6 (text+ko) ====

@@ -1,33 +1,49 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.363 2004/01/11 09:15:13 nyan Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.364 2004/01/16 15:55:29 ru Exp $
 
-.if !defined(NOCRYPT) || defined(ALL_MODULES)
-.if exists(${.CURDIR}/../opencrypto)
-_crypto=	crypto
-_cryptodev=	cryptodev
-.endif
-.if exists(${.CURDIR}/../crypto)
-_random=	random
-.endif
-.endif
+# pcic -- currently broken and being worked on out of tree.
+# oldcard -- specialized use for debugging only.
+# owi -- totally unsupported for debugging only.
 
-SUBDIR=	accf_data \
+SUBDIR=	${_3dfx} \
+	${_aac} \
+	accf_data \
 	accf_http \
+	${_acpi} \
+	${_agp} \
 	aha \
+	${_aic} \
 	aic7xxx \
 	aio \
+	${_amd} \
 	amr \
 	an \
+	${_aout} \
+	${_apm} \
+	${_ar} \
+	${_arcnet} \
+	${_asr} \
 	ath \
+	${_ath_hal} \
 	aue \
+	${_awi} \
 	axe \
 	bfe \
 	bge \
+	${_bios} \
+	${_bktr} \
 	bridge \
 	cam \
+	${_canbepm} \
+	${_canbus} \
+	${_cardbus} \
+	${_cbb} \
 	cd9660 \
 	cd9660_iconv \
+	${_ciss} \
+	${_cm} \
 	coda \
 	coda5 \
+	${_coff} \
 	${_crypto} \
 	${_cryptodev} \
 	cue \
@@ -36,18 +52,37 @@
 	dcons_crom \
 	de \
 	digi \
+	${_dpt} \
+	${_drm} \
 	dummynet \
+	${_ed} \
+	${_el} \
+	${_elink} \
+	${_em} \
 	en \
+	${_ep} \
+	${_ex} \
+	${_exca} \
+	${_ext2fs} \
 	fatm \
 	fdc \
 	fdescfs \
+	${_fe} \
 	firewire \
 	fxp \
+	${_gem} \
 	geom \
 	gx \
 	harp \
 	hatm \
+	${_hfa} \
 	hifn \
+	${_hme} \
+	${_i2c} \
+	${_ibcs2} \
+	${_ida} \
+	${_idt} \
+	${_ie} \
 	if_disc \
 	if_ef \
 	if_faith \
@@ -59,9 +94,12 @@
 	if_tap \
 	if_tun \
 	if_vlan \
+	${_iir} \
 	ip6fw \
+	${_ipfilter} \
+	ipfw \
 	ip_mroute_mod \
-	ipfw \
+	${_ips} \
 	isp \
 	ispfw \
 	joy \
@@ -70,6 +108,9 @@
 	libiconv \
 	libmbpool \
 	libmchain \
+	${_linprocfs} \
+	${_linux} \
+	${_lnc} \
 	lpt \
 	mac_biba \
 	mac_bsdextended \
@@ -86,20 +127,34 @@
 	md \
 	mii \
 	mlx \
+	${_mly} \
 	mpt \
 	msdosfs \
 	msdosfs_iconv \
 	my \
+	${_ncp} \
+	${_ncv} \
+	${_ndis} \
+	${_netgraph} \
 	nfsclient \
 	nfsserver \
 	nge \
 	nmdm \
+	${_nsp} \
 	ntfs \
 	ntfs_iconv \
+	${_null} \
 	nullfs \
+	${_nwfs} \
+	${_oltr} \
+	${_osf1} \
 	patm \
+	${_pccard} \
+	${_pcfclock} \
 	pcn \
+	${_pecoff} \
 	plip \
+	${_pmc} \
 	portalfs \
 	ppbus \
 	ppi \
@@ -109,21 +164,36 @@
 	pst \
 	raidframe \
 	${_random} \
+	${_ray} \
 	rc \
 	rc4 \
 	re \
 	rl \
 	rp \
 	rue \
+	${_s3} \
+	${_safe} \
+	${_sbni} \
 	sbsh \
 	scd \
+	${_scsi_low} \
 	sf \
 	sis \
 	sk \
+	${_smbfs} \
 	sn \
+	${_snc} \
 	snp \
+	${_sound} \
+	${_speaker} \
+	${_splash} \
+	${_sppp} \
+	${_sr} \
 	ste \
+	${_stg} \
+	${_streams} \
 	sym \
+	${_syscons} \
 	sysvipc \
 	ti \
 	tl \
@@ -139,6 +209,7 @@
 	udf \
 	udf_iconv \

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Jan 17 11:52:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B054F16A4D0; Sat, 17 Jan 2004 11:52:10 -0800 (PST)
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 7209816A4CE
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 11:52:10 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CCD1B43D41
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 11:52:08 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0HJq80B088438
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 11:52:08 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0HJq7f9088423
	for perforce@freebsd.org; Sat, 17 Jan 2004 11:52:07 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 17 Jan 2004 11:52:07 -0800 (PST)
Message-Id: <200401171952.i0HJq7f9088423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45500 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: Sat, 17 Jan 2004 19:52:11 -0000

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

Change 45500 by rwatson@rwatson_tislabs on 2004/01/17 11:51:56

	s/funnel/Giant/ and fix up some comments about locking.  There's
	some locking cleanup we can do on FreeBSD that wasn't possible
	on Darwin.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#15 (text+ko) ====

@@ -196,7 +196,9 @@
 		return (-1);
 	}
 	
-	/* XXX This function can be called with the kernel funnel held,
+	/*
+	 * XXX
+	 * This function must be called with Giant held,
 	 * which is not optimal. We should break the write functionality
 	 * away from the BSM record generation and have the BSM generation
 	 * done before this function is called. This function will then
@@ -213,7 +215,7 @@
 static void
 audit_worker(void *arg)
 {
-	int do_replacement_signal, error, release_funnel;
+	int do_replacement_signal, error, release_giant;
 	TAILQ_HEAD(, kaudit_record) ar_worklist;
 	struct kaudit_record *ar;
 	struct vnode *audit_vp, *old_vp;
@@ -222,25 +224,20 @@
 
 	AUDIT_PRINTF(("audit_worker starting\n"));
 
+	/*
+	 * These are thread-local variables requiring no synchronization.
+	 */
 	TAILQ_INIT(&ar_worklist);
 	audit_cred = NULL;
 	audit_td = curthread;
 	audit_vp = NULL;
 
-	/*
-	 * XXX: Presumably we can assume Mach threads are started without
-	 * holding the BSD kernel funnel?
-	 */
-#ifdef DARWIN_FOO
-	thread_funnel_set(kernel_flock, FALSE);
-#endif
-
 	mtx_lock(&audit_mtx);
 	while (1) {
 		/*
 		 * First priority: replace the audit log target if requested.
 		 * As we actually close the vnode in the worker thread, we
-		 * need to grab the funnel, which means releasing audit_mtx.
+		 * need to grab Giant, which means releasing audit_mtx.
 		 * In case another replacement was scheduled while the mutex
 		 * we released, we loop.
 		 *
@@ -263,9 +260,9 @@
 			if (old_vp != NULL || audit_vp != NULL) {
 				mtx_unlock(&audit_mtx);
 				mtx_lock(&Giant);
-				release_funnel = 1;
+				release_giant = 1;
 			} else
-				release_funnel = 0;
+				release_giant = 0;
 			/*
 			 * XXX: What to do about write failures here?
 			 */
@@ -281,7 +278,7 @@
 			if (audit_vp != NULL) {
 				AUDIT_PRINTF(("Opening new audit file\n"));
 			}
-			if (release_funnel) {
+			if (release_giant) {
 				mtx_unlock(&Giant);
 				mtx_lock(&audit_mtx);
 			}
@@ -321,7 +318,7 @@
 		 *
 		 * XXX: We go out of our way to avoid calling audit_free()
 		 * with the audit_mtx held, to avoid a lock order reversal
-		 * as free() may grab the funnel.  This will be fixed at
+		 * as free() may grab Giant.  This will be fixed at
 		 * some point.
 		 */
 		if (audit_vp == NULL) {
@@ -347,15 +344,15 @@
 		 *
 		 * XXX: We go out of our way to avoid calling audit_free()
 		 * with the audit_mtx held, to avoid a lock order reversal
-		 * as free() may grab the funnel.  This will be fixed at
-		 * some point.
+		 * as free() may grab Giant.
+		 * XXX: Note that this is not true in FreeBSD.
 		 */
 		while ((ar = TAILQ_FIRST(&audit_q))) {
 			TAILQ_REMOVE(&audit_q, ar, k_q);
 			TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q);
 		}
 		mtx_unlock(&audit_mtx);
-		release_funnel = 0;
+		release_giant = 0;
 		while ((ar = TAILQ_FIRST(&ar_worklist))) {
 			TAILQ_REMOVE(&ar_worklist, ar, k_q);
 			if (audit_vp != NULL) {
@@ -363,13 +360,9 @@
 				 * XXX: What should happen if there's a write
 				 * error here?
 				 */
-				if (!release_funnel) {
-#ifdef DARWIN_FOO
-					thread_funnel_set(kernel_flock, TRUE);
-#else
+				if (!release_giant) {
 					mtx_lock(&Giant);
-#endif
-					release_funnel = 1;
+					release_giant = 1;
 				}
 				VOP_LEASE(audit_vp, audit_td, audit_cred,
 				    LEASE_WRITE);
@@ -381,7 +374,7 @@
 			}
 			audit_free(ar);
 		}
-		if (release_funnel)
+		if (release_giant)
 			mtx_unlock(&Giant);
 		mtx_lock(&audit_mtx);
 	}

From owner-p4-projects@FreeBSD.ORG  Sat Jan 17 12:48:29 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D9F6A16A4D0; Sat, 17 Jan 2004 12:48:28 -0800 (PST)
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 A93AE16A4CF
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 12:48:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9604F43D5F
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 12:47:28 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0HKlS0B006069
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 12:47:28 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0HKlF92006064
	for perforce@freebsd.org; Sat, 17 Jan 2004 12:47:15 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 17 Jan 2004 12:47:15 -0800 (PST)
Message-Id: <200401172047.i0HKlF92006064@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45502 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: Sat, 17 Jan 2004 20:48:29 -0000

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

Change 45502 by rwatson@rwatson_tislabs on 2004/01/17 12:47:07

	Integrate audit2 userspace from trustedbsd_base (a bit past 5.2-RELEASE).

Affected files ...

.. //depot/projects/trustedbsd/audit2/COPYRIGHT#2 integrate
.. //depot/projects/trustedbsd/audit2/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/Makefile.inc1#2 integrate
.. //depot/projects/trustedbsd/audit2/UPDATING#2 integrate
.. //depot/projects/trustedbsd/audit2/bin/chmod/chmod.c#2 integrate
.. //depot/projects/trustedbsd/audit2/bin/date/date.1#2 integrate
.. //depot/projects/trustedbsd/audit2/bin/ls/ls.1#2 integrate
.. //depot/projects/trustedbsd/audit2/bin/ls/ls.c#2 integrate
.. //depot/projects/trustedbsd/audit2/bin/rm/rm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/bin/sh/eval.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/amd/fsinfo/fsinfo.8#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/gcc/c-lex.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/alpha/freebsd.h#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/alpha/linux-ecoff.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/alpha/osf12.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/alpha/osf2or3.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/arm/arm-wince-pe.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/arm/riscix.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/arm/riscix1-1.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/arm/rix-gas.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/arm/t-riscix#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-c4x.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-i128.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-i32.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-i386.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-i64.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-m68k.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-sh.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-sparc.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/float-vax.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/386bsd.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/aix386.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/aix386ng.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/bsd386.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/dgux.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/djgpp-rtems.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/freebsd.h#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/freebsd64.h#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/interix.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/isc.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/isccoff.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/iscdbx.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/linux-oldld.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/next.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/osf1-ci.asm#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/osf1-cn.asm#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/osf1elf.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/osf1elfgdb.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/osfelf.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/osfrose.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/rtems.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/seq-gas.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/seq-sysv3.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/seq2-sysv3.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/sequent.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/sol2gas.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/sun.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/sun386.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/t-dgux#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/t-next#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/t-osf#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/t-osf1elf#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/t-sco5gas#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/i386/v3gas.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/nextstep-protos.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/nextstep.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/nextstep.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/nextstep21.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/rs6000/softfloat.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/s390/t-linux#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/sparc/freebsd.h#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/sparc/rtems.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/sparc/sol2-g1.asm#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/sparc/sol27-sld.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/config/t-install-cpp#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/cp/mpw-config.in#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/cp/mpw-make.sed#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/dependence.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/doc/vms.texi#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/enquire.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/f/version.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/f/version.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/function.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/gcc/ggc-callbacks.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/halfpic.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/halfpic.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/hash.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/hash.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/tradcif.y#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/tradcpp.c#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/gcc/tradcpp.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/ipfilter/ipmon.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/ipfilter/ipt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/ipfilter/kmem.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/libf2c/ChangeLog.egcs#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libf2c/libI77/rawio.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libobjc/objc-features.texi#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libreadline/readline.h#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/generic/bits/limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/aix/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/aix/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/aix/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/generic/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/generic/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/hpux/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/newlib/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/configure.host#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/backward/strstream.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/bits/generic_shadow.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/bits/slice.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/assert.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_climits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/ctype.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/errno.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/fcntl.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/features.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/float.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/iconv.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/iolibio.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/langinfo.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/libio.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/libioP.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/limits.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/locale.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/math.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/pthread.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/setjmp.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/signal.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/stdarg.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/stddef.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/stdio.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/stdlib.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/string.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/sys/cdefs.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/time.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/unistd.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/wchar.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/include/c_shadow/wctype.h#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/mkcshadow#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/libstdc++/mkinclosure#2 delete
.. //depot/projects/trustedbsd/audit2/contrib/openpam/lib/openpam_ttyconv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/pnpinfo/pnpinfo.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/tcp_wrappers/socket.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/tcpdump/print-isakmp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/contrib/tcpdump/print-radius.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/CREDITS#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ChangeLog#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/FREEBSD-upgrade#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/INSTALL#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/LICENCE#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/Makefile.in#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/README.dns#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/README.privsep#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/README.smartcard#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/TODO#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/acconfig.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/atomicio.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/atomicio.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-krb4.c#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-krb5.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-options.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-pam.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-pam.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-passwd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-rh-rsa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-rhosts.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-rsa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-sia.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth-sia.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth1.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-chall.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-gss.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-none.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-pam-freebsd.c#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-pam.c#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-pam.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/auth2.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/authfd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/authfd.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/authfile.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/bufaux.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/bufaux.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/buffer.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/canohost.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/channels.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/cipher-3des1.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/cipher-aes.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/cipher-bf1.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/cipher-ctr.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/cipher.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/clientloop.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/compat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/compat.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/config.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/configure.ac#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/deattack.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/defines.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/dh.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/dispatch.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/dns.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/dns.h#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/entropy.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/groupaccess.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/gss-genr.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/gss-serv-krb5.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/gss-serv.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/hostfile.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/includes.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/key.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/key.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/log.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/log.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/loginrec.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/loginrec.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/logintest.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/md5crypt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/md5crypt.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/mdoc2man.awk#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/mdoc2man.pl#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/misc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/misc.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/moduli.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/moduli.h#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/monitor.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/monitor.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/monitor_fdpass.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/monitor_wrap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/monitor_wrap.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/msg.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/myproposal.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/nchan.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/Makefile.in#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/base64.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/basename.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/basename.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bindresvport.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-arc4random.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-cray.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-cray.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-getpeereid.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-misc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-misc.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-nextstep.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-snprintf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-snprintf.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/bsd-waitpid.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/daemon.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/dirname.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/dirname.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-gai-errnos.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-getnameinfo.c#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-getnameinfo.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-rfc2553.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-rfc2553.h#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/fake-socket.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getcwd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getcwd.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getgrouplist.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getopt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getopt.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getrrsetbyname.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/getrrsetbyname.h#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/glob.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/glob.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/inet_aton.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/inet_ntoa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/inet_ntoa.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/inet_ntop.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/inet_ntop.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/mktemp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/mktemp.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/port-aix.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/port-aix.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/port-irix.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/port-irix.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/realpath.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/realpath.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/rresvport.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/rresvport.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/setenv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/setenv.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/setproctitle.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/setproctitle.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strlcat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strlcat.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strlcpy.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strlcpy.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strmode.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strmode.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strsep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/strsep.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/vis.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/vis.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/xcrypt.c#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/xmmap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/openbsd-compat/xmmap.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/packet.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/packet.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/progressmeter.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/radix.c#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/radix.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/readconf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/readconf.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/README.regress#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/agent-getpeereid.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/agent-ptrace.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/agent-timeout.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/agent.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/authorized_keys_root#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/dynamic-forward.sh#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/forwarding.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/proto-version.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/reconfigure.sh#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/rekey.sh#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/sftp-badcmds.sh#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/sftp-batch.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/sftp-cmds.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/sftp.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/ssh-com-client.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/ssh-com-keygen.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/ssh-com-sftp.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/ssh-com.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/stderr-after-eof.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/stderr-data.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/test-exec.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/transfer.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/try-ciphers.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/regress/yes-head.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/scard-opensc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/scard.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/scard.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/scp.1#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/scp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/servconf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/servconf.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/serverloop.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/session.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/session.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sftp-client.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sftp-common.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sftp-int.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sftp-server.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sftp.1#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sftp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-add.1#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-add.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-agent.1#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-agent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-dss.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-gss.h#1 branch
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-keygen.1#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-keygen.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-keyscan.1#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-keyscan.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-keysign.8#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-keysign.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-rand-helper.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-rsa.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh-rsa.h#2 delete
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh.1#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh2.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh_config#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ssh_config.5#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshconnect.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshconnect1.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshconnect2.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshd.8#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshd_config#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshd_config.5#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshlogin.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshpty.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/sshtty.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/ttymodes.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/uidswap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssh/version.h#2 integrate
.. //depot/projects/trustedbsd/audit2/crypto/openssl/apps/openssl.cnf#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/apmd.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/defaults/rc.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/devd.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/moduli#2 delete
.. //depot/projects/trustedbsd/audit2/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/mtree/BSD.local.dist#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/mtree/BSD.usr.dist#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/periodic/daily/150.clean-hoststat#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/cleartmp#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/cron#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/diskless#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/jail#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/mountcritlocal#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/power_profile#1 branch
.. //depot/projects/trustedbsd/audit2/etc/rc.d/root#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.d/syscons#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.resume#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.subr#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/rc.suspend#2 integrate
.. //depot/projects/trustedbsd/audit2/etc/sendmail/freebsd.mc#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/datfiles/fortunes2#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/datfiles/fortunes2-o#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/datfiles/freebsd-tips#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/datfiles/murphy#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/datfiles/startrek#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/fortune/fortune.c#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/strfile/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/games/fortune/strfile/strfile.c#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/lib/libstdc++/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/cc/cc_int/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/cc/f77/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/cc/f771/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/cc/include/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/trustedbsd/audit2/include/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/include/dirent.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/fnmatch.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/locale.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/nss.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/paths.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/regex.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/resolv.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/rpc/types.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/stddef.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/stdio.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/stdlib.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/string.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/strings.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/time.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/unistd.h#2 integrate
.. //depot/projects/trustedbsd/audit2/include/wchar.h#2 integrate
.. //depot/projects/trustedbsd/audit2/kerberos5/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libc.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libc_r.so.4.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libdevstat.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libedit.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libmp.so.3.bz2.uu#1 branch
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libpam.so.1.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libperl.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libposix1e.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libskey.so.2.bz2.uu#1 branch
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libstdc++.so.3.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/libusbhid.so.0.bz2.uu#1 branch
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_cleartext_pass_ok.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_deny.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_opie.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_permit.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_radius.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_skey.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_ssh.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_tacplus.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.alpha/pam_unix.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_opieaccess.so.bz2.uu#1 branch
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/alpha/gen/fpgetmask.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/alpha/gen/fpsetmask.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/alpha/gen/makecontext.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/amd64/gen/makecontext.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/gdtoa/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/gen/getpwent.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/gen/opendir.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/gen/sysconf.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/gen/ttyname.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/gmon/mcount.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/i386/sys/i386_get_ldt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/i386/sys/i386_set_ldt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/i386/sys/i386_vm86.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/ia64/gen/makecontext.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/ia64/gen/signalcontext.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/gbk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/localeconv.3#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/mblen.3#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/mbstowcs.3#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/mbtowc.3#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/multibyte.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/setlocale.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/setlocale.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/setrunelocale.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/srune.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/wcstold.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/wcstombs.3#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/locale/wctomb.3#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/net/nss_compat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/net/res_init.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/net/res_send.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/posix1e/acl_delete_entry.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/posix1e/mac.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/powerpc/_fpmath.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/rpc/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sparc64/fpu/fpu.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sparc64/gen/signalcontext.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sparc64/sys/__sparc_utrap.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sparc64/sys/__sparc_utrap_install.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sparc64/sys/__sparc_utrap_setup.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/stdio/getc.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/stdio/vfscanf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/stdio/vfwprintf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/stdio/vfwscanf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/stdlib/atexit.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/stdlib/atexit.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/stdlib/exit.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/string/ffs.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/string/ffs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/string/ffsl.c#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/string/fls.c#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/string/flsl.c#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libc/string/index.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/string/rindex.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/accept.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/getpeername.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/getsockname.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/getsockopt.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/kse.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/ktrace.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/ptrace.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/recv.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/sendfile.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/man/pthread_mutex_init.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/uthread/pthread_private.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/uthread/uthread_create.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/uthread/uthread_init.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/uthread/uthread_join.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/uthread/uthread_rwlock.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/uthread/uthread_sig.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libc_r/uthread/uthread_write.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libio/alpha_sethae.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libkiconv/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libkiconv/kiconv.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libkiconv/xlat16_iconv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/libpam/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_echo/pam_echo.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_group/pam_group.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_ksu/pam_ksu.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_login_access/pam_login_access.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_rhosts/pam_rhosts.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_securetty/pam_securetty.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_attr.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_equal.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_exit.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_getspecific.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_join.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_key_create.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_key_delete.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_kill.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_mutex_init.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_mutex_lock.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_mutexattr.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_once.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_rwlock_wrlock.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_schedparam.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_self.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_setspecific.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_sigmask.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/pthread_testcancel.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/sem_destroy.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/sem_getvalue.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/sem_init.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/sem_post.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/sem_wait.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/man/sigwait.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/pthread.map#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_accept.c#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_aio_suspend.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_cancel.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_close.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_cond.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_connect.c#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_creat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_create.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_fcntl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_fsync.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_join.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_kern.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_msync.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_mutex.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_nanosleep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_open.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_pause.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_poll.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_private.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_pselect.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_read.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_readv.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_rwlock.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_select.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_sem.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_sig.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_sigsuspend.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_sigwait.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_sleep.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_spinlock.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_system.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_tcdrain.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_wait.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_wait4.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_waitpid.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_write.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libpthread/thread/thr_writev.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libsdp/sdp-int.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libsdp/sdp.3#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libsdp/search.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libsdp/session.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libsdp/util.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libstand/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libstand/gzipfs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_cond.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_create.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_init.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_kern.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_private.h#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_resume_np.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_setschedparam.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_sig.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_spinlock.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_subr.c#1 branch
.. //depot/projects/trustedbsd/audit2/lib/libthr/thread/thr_syscalls.c#2 integrate
.. //depot/projects/trustedbsd/audit2/lib/libusbhid/usbhid.3#2 integrate
.. //depot/projects/trustedbsd/audit2/libexec/ftpd/ftpd.c#2 integrate
.. //depot/projects/trustedbsd/audit2/libexec/rshd/rshd.8#2 integrate
.. //depot/projects/trustedbsd/audit2/libexec/rtld-elf/amd64/lockdflt.c#2 integrate
.. //depot/projects/trustedbsd/audit2/libexec/rtld-elf/amd64/reloc.c#2 integrate
.. //depot/projects/trustedbsd/audit2/libexec/rtld-elf/amd64/rtld_machdep.h#2 integrate
.. //depot/projects/trustedbsd/audit2/libexec/rtld-elf/rtld.c#2 integrate
.. //depot/projects/trustedbsd/audit2/release/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/release/Makefile.inc.docports#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/ja_JP.eucJP/early-adopter/article.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/ja_JP.eucJP/errata/article.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate
.. //depot/projects/trustedbsd/audit2/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/trustedbsd/audit2/release/i386/drivers.conf#2 integrate
.. //depot/projects/trustedbsd/audit2/release/scripts/mkpkgindex.sh#1 branch
.. //depot/projects/trustedbsd/audit2/release/scripts/print-cdrom-packages.sh#2 integrate
.. //depot/projects/trustedbsd/audit2/rescue/rescue/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/atm/atm/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/atm/atm/atm_eni.c#2 delete
.. //depot/projects/trustedbsd/audit2/sbin/atm/atm/atm_show.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/atm/ilmid/ilmid.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/bsdlabel/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/ccdconfig/ccdconfig.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/comcontrol/comcontrol.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/cxconfig/Makefile#2 delete
.. //depot/projects/trustedbsd/audit2/sbin/cxconfig/cxconfig.8#2 delete
.. //depot/projects/trustedbsd/audit2/sbin/cxconfig/cxconfig.c#2 delete
.. //depot/projects/trustedbsd/audit2/sbin/dhclient/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/dump/main.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/dumpfs/dumpfs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fdisk/fdisk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck/fsutil.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck/fsutil.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/boot.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/check.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/dir.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/dosfs.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/ext.h#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/fat.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/fsck_msdosfs.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/fsck_msdosfs/main.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/growfs/growfs.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/init/init.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/ip6fw/ip6fw.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mdconfig/mdconfig.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mount/getmntopts.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mount/mount.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mount_cd9660/mount_cd9660.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mount_ntfs/mount_ntfs.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mount_nullfs/mount_nullfs.8#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/mount_udf/mount_udf.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/route/route.c#2 integrate
.. //depot/projects/trustedbsd/audit2/sbin/sconfig/Makefile#1 branch
.. //depot/projects/trustedbsd/audit2/sbin/sconfig/sconfig.8#1 branch
.. //depot/projects/trustedbsd/audit2/sbin/sconfig/sconfig.c#1 branch
.. //depot/projects/trustedbsd/audit2/sbin/umount/umount.c#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/lib/libssh/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/libexec/sftp-server/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.bin/ssh/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/secure/usr.sbin/sshd/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/colldef/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/colldef/be_BY.CP1131.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/colldef/be_BY.CP1251.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/colldef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/colldef/map.CP1131#1 branch
.. //depot/projects/trustedbsd/audit2/share/examples/meteor/rgb16.c#2 integrate
.. //depot/projects/trustedbsd/audit2/share/examples/meteor/rgb24.c#2 integrate
.. //depot/projects/trustedbsd/audit2/share/examples/meteor/test-n.c#2 integrate
.. //depot/projects/trustedbsd/audit2/share/examples/meteor/yuvpk.c#2 integrate
.. //depot/projects/trustedbsd/audit2/share/examples/meteor/yuvpl.c#2 integrate
.. //depot/projects/trustedbsd/audit2/share/examples/scsi_target/scsi_cmds.c#2 integrate
.. //depot/projects/trustedbsd/audit2/share/examples/scsi_target/scsi_target.h#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man3/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man3/pthread.3#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man3/pthread_mutex_timedlock.3#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man4/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/acpi.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/acpi_thermal.4#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man4/aha.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/amr.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ata.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ath.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ath_hal.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/aue.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/crypto.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/dc.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/dcons.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/dcons_crom.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/digi.4#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man4/ef.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/firewire.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/fpa.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/fwe.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/fwohci.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/gdb.4#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man4/gx.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/harp.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/kue.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/lge.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/lmc.4#2 delete
.. //depot/projects/trustedbsd/audit2/share/man/man4/mac_stub.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/man4.i386/CPU_ELAN.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/man4.i386/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/man4.i386/cx.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/man4.i386/dgb.4#2 delete
.. //depot/projects/trustedbsd/audit2/share/man/man4/man4.i386/meteor.4#2 delete
.. //depot/projects/trustedbsd/audit2/share/man/man4/man4.i386/ndis.4#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man4/matcd.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/meteor.4#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man4/miibus.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ng_atm.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ng_atmpif.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ng_iface.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ng_pppoe.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ng_sscfu.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ng_sscop.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ng_uni.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/nge.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/pccbb.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/polling.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/re.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/rndtest.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/rue.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/safe.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/sbp.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/sbp_targ.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/sk.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/ste.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/stg.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/umass.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/uscanner.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/utopia.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/vinumdebug.4#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man4/vpo.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/wi.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man4/xe.4#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man5/devfs.5#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man5/resolver.5#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man7/release.7#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man8/diskless.8#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/BUS_SETUP_INTR.9#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/bus_alloc_resource.9#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/cr_seeothergids.9#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man9/cr_seeotheruids.9#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man9/hexdump.9#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man9/kobj.9#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/mutex.9#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/p_candebug.9#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man9/prison_check.9#1 branch
.. //depot/projects/trustedbsd/audit2/share/man/man9/sbuf.9#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/sx.9#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/taskqueue.9#2 integrate
.. //depot/projects/trustedbsd/audit2/share/man/man9/vn_fullpath.9#1 branch
.. //depot/projects/trustedbsd/audit2/share/misc/bsd-family-tree#2 integrate
.. //depot/projects/trustedbsd/audit2/share/mk/bsd.cpu.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/share/mk/bsd.dep.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/share/mk/bsd.obj.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/trustedbsd/audit2/share/mklocale/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/mklocale/be_BY.CP1131.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/mklocale/zh_HK.Big5HKSCS.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/monetdef/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/monetdef/be_BY.CP1131.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/monetdef/be_BY.CP1251.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/monetdef/be_BY.ISO8859-5.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/msgdef/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit2/share/msgdef/be_BY.CP1131.src#1 branch
.. //depot/projects/trustedbsd/audit2/share/msgdef/be_BY.CP1251.src#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Jan 17 12:49:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D516F16A4D0; Sat, 17 Jan 2004 12:49:32 -0800 (PST)
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 B00D316A4CE
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 12:49:32 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7E6643D60
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 12:49:31 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0HKnV0B006110
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 12:49:31 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0HKnVYM006107
	for perforce@freebsd.org; Sat, 17 Jan 2004 12:49:31 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 17 Jan 2004 12:49:31 -0800 (PST)
Message-Id: <200401172049.i0HKnVYM006107@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45503 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: Sat, 17 Jan 2004 20:49:33 -0000

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

Change 45503 by rwatson@rwatson_tislabs on 2004/01/17 12:48:51

	Basic "auditon" implementation -- use auditctl() to turn on and off the
	trail (nothing more refined than that).

Affected files ...

.. //depot/projects/trustedbsd/audit2/usr.sbin/Makefile#3 edit
.. //depot/projects/trustedbsd/audit2/usr.sbin/auditon/Makefile#1 add
.. //depot/projects/trustedbsd/audit2/usr.sbin/auditon/auditon.c#1 add

Differences ...

==== //depot/projects/trustedbsd/audit2/usr.sbin/Makefile#3 (text+ko) ====

From owner-p4-projects@FreeBSD.ORG  Sat Jan 17 16:10:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1361E16A4D0; Sat, 17 Jan 2004 16:10:44 -0800 (PST)
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 E163C16A4CE
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 16:10:43 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9A4B343D5C
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 16:10:37 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0I0Ab0B052904
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 16:10:37 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0I0AbJw052901
	for perforce@freebsd.org; Sat, 17 Jan 2004 16:10:37 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 17 Jan 2004 16:10:37 -0800 (PST)
Message-Id: <200401180010.i0I0AbJw052901@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45510 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: Sun, 18 Jan 2004 00:10:44 -0000

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

Change 45510 by rwatson@rwatson_tislabs on 2004/01/17 16:09:43

	Hook auditon up to the build.

Affected files ...

.. //depot/projects/trustedbsd/audit2/usr.sbin/Makefile#4 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/usr.sbin/Makefile#4 (text+ko) ====

@@ -13,6 +13,7 @@
 	amd \
 	ancontrol \
 	arp \
+	auditon \
 	bootparamd \
 	bsnmpd \
 	burncd \

From owner-p4-projects@FreeBSD.ORG  Sat Jan 17 18:18:14 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3E64E16A4D0; Sat, 17 Jan 2004 18:18:14 -0800 (PST)
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 134B316A4CE
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 18:18:14 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A2F7C43D1D
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 18:18:12 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0I2IC0B087485
	for <perforce@freebsd.org>; Sat, 17 Jan 2004 18:18:12 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0I2ICBR087482
	for perforce@freebsd.org; Sat, 17 Jan 2004 18:18:12 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 17 Jan 2004 18:18:12 -0800 (PST)
Message-Id: <200401180218.i0I2ICBR087482@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45513 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: Sun, 18 Jan 2004 02:18:14 -0000

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

Change 45513 by jmallett@jmallett_oingo on 2004/01/17 18:17:28

	Trust the hardware to yell about bad PTEs for us.
	
	Suggested by:	cgd

Affected files ...

.. //depot/projects/mips/sys/mips/mips/exception.S#11 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#11 (text+ko) ====

@@ -189,18 +189,10 @@
 	 */
 	ld	k1, 0(k1)
 	addu	k1, k0
-	ld	k0, 0(k1)	/* Even PTE. */
-	andi	k0, PG_V	/* Check validity. */
-	bne	k0, zero, 2f	/* Valid. */
-	nop
-	ld	k0, 8(k1)	/* Odd PTE. */
-	andi	k0, PG_V	/* Check validity. */
-	beq	k0, zero, 1f	/* Invalid. */
-	nop
 	/*
-	 * Valid PTE.  Write the pair.
+	 * Write the pair.
 	 */
-2:	ld	k0, 0(k1)	/* Even PTE. */
+	ld	k0, 0(k1)	/* Even PTE. */
 	ld	k1, 8(k1)	/* Odd PTE. */
 	/*
 	 * Write TLB entry.
@@ -212,30 +204,9 @@
 	nop
 	nop
 	eret
-1:	j	BadPTE
-	nop
-	.set at
 VEND(XTLBMissVector)
 
 /*
- * Yell about a bogus PTE, at 0(k1).
- */
-ENTRY(BadPTE)
-	.set noat
-	dmfc0	a3, MIPS_COP_0_BAD_VADDR
-	move	a1, k1
-	ld	a2, 0(k1)
-	dla	a0, 1f
-	dla	k0, panic
-	dmtc0	k0, MIPS_COP_0_EXC_PC
-	eret
-	.set at
-END(BadPTE)
-	.data
-1:	.asciiz	"Bad PTE at %p (%16lx), badvaddr %lx"
-	.text
-
-/*
  * Handle an interrupt.  Return into panic, for now.
  */
 LEAF(Interrupt)