From owner-p4-projects  Wed Jul 31 19:39:57 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7563837B401; Wed, 31 Jul 2002 19:38:52 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CF3AD37B400
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 19:38:51 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F04DC43E6A
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 19:38:50 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g712coJU001101
	for <perforce@freebsd.org>; Wed, 31 Jul 2002 19:38:50 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g712conp001098
	for perforce@freebsd.org; Wed, 31 Jul 2002 19:38:50 -0700 (PDT)
Date: Wed, 31 Jul 2002 19:38:50 -0700 (PDT)
Message-Id: <200208010238.g712conp001098@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15362 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15362

Change 15362 by rwatson@rwatson_paprika on 2002/07/31 19:38:19

	IFC from trustedbsd base, bringing in a variety of fixes, as well
	as many MAC commits now trickling back through.

Affected files ...

.. //depot/projects/trustedbsd/mac/lib/libstand/nfs.c#4 integrate
.. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 integrate
.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/exception.s#4 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/genassym.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/include/proc.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/boot/common/dev_net.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files#41 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_eisa.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_pci.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#7 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#10 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#69 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/ahc_pci/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahd/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/aicasm/Makefile#1 branch
.. //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/if_tun/Makefile#4 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/procfs/Makefile#7 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/pseudofs/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#16 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/pccard/pccard_nbk.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_vrreg.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/cache.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#16 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/lib/libstand/nfs.c#4 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.9 2002/07/07 23:01:36 jake Exp $");
+__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.10 2002/07/31 20:17:06 jake Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -387,10 +387,14 @@
 {
 	struct iodesc *desc;
 	struct nfs_iodesc *currfd;
+	char buf[2 * NFS_FHSIZE + 3];
+	u_char *fh;
+	char *cp;
+	int i;
 #ifndef NFS_NOSYMLINK
 	struct nfs_iodesc *newfd;
 	struct nfsv2_fattrs *fa;
-	char *cp, *ncp;
+	char *ncp;
 	int c;
 	char namebuf[NFS_MAXPATHLEN + 1];
 	char linkbuf[NFS_MAXPATHLEN + 1];
@@ -422,6 +426,16 @@
 		return (error);
 	nfs_root_node.iodesc = desc;
 
+	fh = &nfs_root_node.fh[0];
+	buf[0] = 'X';
+	cp = &buf[1];
+	for (i = 0; i < NFS_FHSIZE; i++, cp += 2)
+		sprintf(cp, "%02x", fh[i]);
+	sprintf(cp, "X");
+	setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
+	setenv("boot.nfsroot.path", rootpath, 1);
+	setenv("boot.nfsroot.nfshandle", buf, 1);
+
 #ifndef NFS_NOSYMLINK
 	/* Fake up attributes for the root dir. */
 	fa = &nfs_root_node.fa;

==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 (text+ko) ====

@@ -3,7 +3,7 @@
 
   <corpauthor>The FreeBSD Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.400 2002/07/31 16:13:59 bmah Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.401 2002/07/31 20:09:07 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -1951,6 +1951,14 @@
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:32.pppd.asc">FreeBSD-SA-02:32</ulink>.
       &merged;</para>
 
+    <para>Multiple buffer overflows in
+      <application>OpenSSL</application> have been corrected, by way
+      of an upgrade to the base system version of
+      <application>OpenSSL</application>.  More details can be found
+      in security advisory <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:33.openssl.asc">FreeBSD-SA-02:33</ulink>.
+      &merged;</para>
+
   </sect2>
 
   <sect2 id="userland">

==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#3 (text+ko) ====

@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.4 2002/07/13 15:57:23 luigi Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.6 2002/07/31 22:42:08 luigi Exp $
  */
 
 #include <sys/param.h>
@@ -996,7 +996,7 @@
 				printf(" iplen %u", cmd->arg1 );
 				break;
 
-			case O_IPOPTS:
+			case O_IPOPT:
 				print_flags("ipoptions", cmd, f_ipopts);
 				break;
 
@@ -1569,9 +1569,7 @@
 		d = (u_int32_t *)&cmd->mask;
 		cmd->o.opcode = O_IP_DST_SET;	/* default */
 		cmd->o.len |= F_INSN_SIZE(ipfw_insn_u32) + (cmd->o.arg1+31)/32;
-		fprintf(stderr,"-- set size %d cmdlen %d\n",
-			cmd->o.arg1, cmd->o.len );
-		for (i = 0; i < cmd->o.arg1/32 ; i++)
+		for (i = 0; i < (cmd->o.arg1+31)/32 ; i++)
 			d[i] = 0;	/* clear masks */
 
 		av = p+1;
@@ -2170,7 +2168,7 @@
 	 * various flags used to record that we entered some fields.
 	 */
 	int have_mac = 0;	/* set if we have a MAC address */
-	int have_state = 0;	/* check-state or keep-state */
+	ipfw_insn *have_state = NULL;	/* check-state or keep-state */
 
 	int i;
 
@@ -2219,7 +2217,7 @@
 	action->len = 1;	/* default */
 	switch(i) {
 	case TOK_CHECKSTATE:
-		have_state = 1;
+		have_state = action;
 		action->opcode = O_CHECK_STATE;
 		break;
 
@@ -2344,10 +2342,8 @@
 		cmd = next_cmd(cmd);
 	}
 
-	if (have_state) {
-		have_state = 0;
+	if (have_state)	/* must be a check-state, we are done */
 		goto done;
-	}
 
 #define OR_START(target)					\
 	if (ac && (*av[0] == '(' || *av[0] == '{')) {		\
@@ -2610,13 +2606,13 @@
 
 		case TOK_IPOPTS:
 			NEED1("missing argument for ipoptions");
-			fill_flags(cmd, O_IPOPTS, f_ipopts, *av);
+			fill_flags(cmd, O_IPOPT, f_ipopts, *av);
 			ac--; av++;
 			break;
 
 		case TOK_IPTOS:
 			NEED1("missing argument for iptos");
-			fill_flags(cmd, O_IPOPTS, f_iptos, *av);
+			fill_flags(cmd, O_IPTOS, f_iptos, *av);
 			ac--; av++;
 			break;
 
@@ -2697,17 +2693,18 @@
 
 		case TOK_KEEPSTATE:
 			if (have_state)
-				errx(EX_USAGE, "only one of check-state "
+				errx(EX_USAGE, "only one of keep-state "
 					"and limit is allowed");
-			have_state = 1;
+			have_state = cmd;
 			fill_cmd(cmd, O_KEEP_STATE, 0, 0);
 			break;
 
 		case TOK_LIMIT:
 			NEED1("limit needs mask and # of connections");
 			if (have_state)
-				errx(EX_USAGE, "only one of check-state "
+				errx(EX_USAGE, "only one of keep-state "
 					"and limit is allowed");
+			have_state = cmd;
 		    {
 			ipfw_insn_limit *c = (ipfw_insn_limit *)cmd;
 
@@ -2730,7 +2727,6 @@
 			if (c->limit_mask == 0)
 				errx(EX_USAGE, "missing limit mask");
 			ac--; av++;
-			have_state = 1;
 		    }
 			break;
 
@@ -2756,23 +2752,36 @@
 	/*
 	 * generate O_PROBE_STATE if necessary
 	 */
-	if (have_state) {
+	if (have_state && have_state->opcode != O_CHECK_STATE) {
 		fill_cmd(dst, O_PROBE_STATE, 0, 0);
 		dst = next_cmd(dst);
 	}
 	/*
-	 * copy all commands but O_LOG
+	 * copy all commands but O_LOG, O_KEEP_STATE, O_LIMIT
 	 */
 	for (src = (ipfw_insn *)cmdbuf; src != cmd; src += i) {
 		i = F_LEN(src);
 
-		if (src->opcode != O_LOG) {
+		switch (src->opcode) {
+		case O_LOG:
+		case O_KEEP_STATE:
+		case O_LIMIT:
+			break;
+		default:
 			bcopy(src, dst, i * sizeof(u_int32_t));
 			dst += i;
 		}
 	}
 
 	/*
+	 * put back the have_state command as last opcode
+	 */
+	if (have_state) {
+		i = F_LEN(have_state);
+		bcopy(have_state, dst, i * sizeof(u_int32_t));
+		dst += i;
+	}
+	/*
 	 * start action section
 	 */
 	rule->act_ofs = dst - rule->cmd;

==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/exception.s#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *	$NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $
- * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.15 2002/03/29 16:35:25 jake Exp $
+ * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.16 2002/07/31 19:37:02 jhb Exp $
  */
 
 #include <machine/asm.h>
@@ -151,7 +151,7 @@
 
 	/* set the hae register if this process has specified a value */
 	ldq	t1, TD_MD_FLAGS(s0)
-	and	t1, MDP_HAEUSED
+	and	t1, MDTD_HAEUSED
 	beq	t1, 3f
 	ldq	a0, TD_MD_HAE(s0)
 	ldq	pv, chipset + CHIPSET_WRITE_HAE
@@ -302,7 +302,7 @@
 Lrestoreregs:
 	/* set the hae register if this process has specified a value */
 	ldq	t1, TD_MD_FLAGS(s0)
-	and	t1, MDP_HAEUSED
+	and	t1, MDTD_HAEUSED
 	beq	t1, Lnohae
 	ldq	a0, TD_MD_HAE(t0)
 	ldq	pv, chipset + CHIPSET_WRITE_HAE

==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/genassym.c#7 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.39 2002/07/12 18:34:21 jhb Exp $
+ * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.40 2002/07/31 19:37:02 jhb Exp $
  */
 
 #include <sys/param.h>
@@ -92,7 +92,7 @@
 #ifdef SMP
 ASSYM(TD_MD_KERNNEST, offsetof(struct thread, td_md.md_kernnest));
 #endif
-ASSYM(MDP_HAEUSED, MDP_HAEUSED);
+ASSYM(MDTD_HAEUSED, MDTD_HAEUSED);
 
 ASSYM(CHIPSET_WRITE_HAE, offsetof(struct alpha_chipset, write_hae));
 

==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#11 (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/alpha/alpha/machdep.c,v 1.179 2002/04/17 13:06:32 mux Exp $
+ * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.180 2002/07/31 19:37:02 jhb Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1209,7 +1209,7 @@
 
 	/* save the floating-point state, if necessary, then copy it. */
 	alpha_fpstate_save(td, 1);		/* XXX maybe write=0 */
-	ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED;
+	ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED;
 	bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs,
 	    sizeof(struct fpreg));
 	ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control;
@@ -1332,7 +1332,7 @@
 #endif
 	/* save the floating-point state, if necessary, then copy it. */
 	alpha_fpstate_save(td, 1);
-	sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDP_FPUSED;
+	sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED;
 	bcopy(&td->td_pcb->pcb_fp,
 	      (struct fpreg *)sf.sf_uc.uc_mcontext.mc_fpregs,
 	      sizeof(struct fpreg));
@@ -1606,7 +1606,7 @@
 	tfp->tf_regs[FRAME_T12] = tfp->tf_regs[FRAME_PC];	/* a.k.a. PV */
 	tfp->tf_regs[FRAME_FLAGS] = 0;			/* full restore */
 
-	td->td_md.md_flags &= ~MDP_FPUSED;
+	td->td_md.md_flags &= ~MDTD_FPUSED;
 	alpha_fpstate_drop(td);
 }
 
@@ -1720,13 +1720,13 @@
 int
 ptrace_clear_single_step(struct thread *td)
 {
-	if (td->td_md.md_flags & MDP_STEP2) {
+	if (td->td_md.md_flags & MDTD_STEP2) {
 		ptrace_clear_bpt(td, &td->td_md.md_sstep[1]);
 		ptrace_clear_bpt(td, &td->td_md.md_sstep[0]);
-		td->td_md.md_flags &= ~MDP_STEP2;
-	} else if (td->td_md.md_flags & MDP_STEP1) {
+		td->td_md.md_flags &= ~MDTD_STEP2;
+	} else if (td->td_md.md_flags & MDTD_STEP1) {
 		ptrace_clear_bpt(td, &td->td_md.md_sstep[0]);
-		td->td_md.md_flags &= ~MDP_STEP1;
+		td->td_md.md_flags &= ~MDTD_STEP1;
 	}
 	return 0;
 }
@@ -1740,7 +1740,7 @@
 	vm_offset_t addr[2];	/* places to set breakpoints */
 	int count = 0;		/* count of breakpoints */
 
-	if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2))
+	if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2))
 		panic("ptrace_single_step: step breakpoints not removed");
 
 	error = ptrace_read_int(td, pc, &ins.bits);
@@ -1793,9 +1793,9 @@
 			ptrace_clear_bpt(td, &td->td_md.md_sstep[0]);
 			return error;
 		}
-		td->td_md.md_flags |= MDP_STEP2;
+		td->td_md.md_flags |= MDTD_STEP2;
 	} else
-		td->td_md.md_flags |= MDP_STEP1;
+		td->td_md.md_flags |= MDTD_STEP1;
 
 	return 0;
 }
@@ -2132,7 +2132,7 @@
 		SET_FEN(td);
 	}
 
-	td->td_md.md_flags |= MDP_FPUSED;
+	td->td_md.md_flags |= MDTD_FPUSED;
 	intr_restore(s);
 }
 

==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.17 2002/04/01 21:30:29 jhb Exp $
+ * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.18 2002/07/31 19:37:02 jhb Exp $
  *
  */
 
@@ -122,7 +122,7 @@
 	if (error)
 		return (error);
 
-	td->td_md.md_flags |= MDP_HAEUSED;
+	td->td_md.md_flags |= MDTD_HAEUSED;
 	td->td_md.md_hae = ua.hae;
 
 	return (0);
@@ -169,8 +169,7 @@
 {
 	int error;
 	unsigned long uac;
-	struct proc *p;
-	struct thread *td2;
+	struct proc *p, *pp;
 
 	error = copyin(args, &uac, sizeof(uac));
 	if (error)
@@ -178,13 +177,11 @@
 
 	p = td->td_proc;
 	PROC_LOCK(p);
-	if (p->p_pptr) {
-		PROC_LOCK(p->p_pptr);
-		/* XXXKSE which threads? */
-		td2 = FIRST_THREAD_IN_PROC(p->p_pptr);
-		td2->td_md.md_flags &= ~MDP_UAC_MASK;
-		td2->td_md.md_flags |= uac & MDP_UAC_MASK;
-		PROC_UNLOCK(p->p_pptr);
+	pp = p->p_pptr;
+	if (pp != NULL) {
+		PROC_LOCK(pp);
+		pp->p_md.md_uac = uac & MDP_UAC_MASK;
+		PROC_UNLOCK(pp);
 	}
 	PROC_UNLOCK(p);
 	return 0;
@@ -193,20 +190,18 @@
 static	int
 alpha_get_uac(struct thread *td, char *args)
 {
-	struct proc *p;
-	struct thread *td2;
+	struct proc *p, *pp;
 	int error;
 	unsigned long uac;
 
 	p = td->td_proc;
 	error = ESRCH;
 	PROC_LOCK(p);
-	if (p->p_pptr) {
-		PROC_LOCK(p->p_pptr);
-		/* XXXKSE which threads? */
-		td2 = FIRST_THREAD_IN_PROC(p->p_pptr);
-		uac = td2->td_md.md_flags & MDP_UAC_MASK;
-		PROC_UNLOCK(p->p_pptr);
+	pp = p->p_pptr;
+	if (pp != NULL) {
+		PROC_LOCK(pp);
+		uac = p->p_md.md_uac;
+		PROC_UNLOCK(pp);
 		PROC_UNLOCK(p);
 		error = copyout(&uac, args, sizeof(uac));
 	} else

==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#13 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.98 2002/07/13 04:36:30 mini Exp $ */
+/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.99 2002/07/31 19:37:02 jhb Exp $ */
 /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */
 
 /*
@@ -407,7 +407,7 @@
 			/* FALLTHROUTH */
 		case ALPHA_IF_CODE_BPT:
 		case ALPHA_IF_CODE_BUGCHK:
-			if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) {
+			if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) {
 				mtx_lock(&Giant);
 				ptrace_clear_single_step(td);
 				td->td_frame->tf_regs[FRAME_PC] -= 4;
@@ -1033,8 +1033,8 @@
 	 */
 
 	if (td) {
-		uac = td->td_md.md_flags & MDP_UAC_MASK;
 		p = td->td_proc;
+		uac = p->p_md.md_uac;
 	} else {
 		uac = 0;
 		p = NULL;

==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#7 (text+ko) ====

@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.68 2002/06/29 17:26:11 julian Exp $
+ * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.69 2002/07/31 19:37:02 jhb Exp $
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -133,7 +133,8 @@
 	p1 = td1->td_proc;
 	td2->td_pcb = (struct pcb *)
 	    (td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
-	td2->td_md.md_flags = td1->td_md.md_flags & (MDP_FPUSED | MDP_UAC_MASK);
+	td2->td_md.md_flags = td1->td_md.md_flags & MDTD_FPUSED;
+	p2->p_md.md_uac = p1->p_md.md_uac;
 
 	/*
 	 * Cache the physical address of the pcb, so we can

==== //depot/projects/trustedbsd/mac/sys/alpha/include/proc.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.14 2002/03/27 05:39:16 dillon Exp $ */
+/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.15 2002/07/31 19:37:02 jhb Exp $ */
 /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */
 
 /*
@@ -40,6 +40,11 @@
 	u_int32_t	contents;
 };
 
+#define	MDTD_FPUSED	0x0001		/* Process used the FPU */
+#define	MDTD_STEP1	0x0002		/* Single step normal instruction */
+#define	MDTD_STEP2	0x0004		/* Single step branch instruction */
+#define	MDTD_HAEUSED	0x0008		/* Process used the HAE */
+
 struct mdthread {
 	u_long		md_flags;
 	struct pcb	*md_pcbpaddr;	/* phys addr of the pcb */
@@ -50,17 +55,14 @@
 	register_t	md_savecrit;	/* save PSL for critical section */
 };
 
-#define	MDP_FPUSED	0x0001		/* Process used the FPU */
-#define MDP_STEP1	0x0002		/* Single step normal instruction */
-#define MDP_STEP2	0x0004		/* Single step branch instruction */
-#define MDP_HAEUSED	0x0008		/* Process used the HAE */
-#define MDP_UAC_NOPRINT	0x0010		/* Don't print unaligned traps */
-#define MDP_UAC_NOFIX	0x0020		/* Don't fixup unaligned traps */
-#define MDP_UAC_SIGBUS	0x0040		/* Deliver SIGBUS upon
+#define	MDP_UAC_NOPRINT	0x0010		/* Don't print unaligned traps */
+#define	MDP_UAC_NOFIX	0x0020		/* Don't fixup unaligned traps */
+#define	MDP_UAC_SIGBUS	0x0040		/* Deliver SIGBUS upon
 					   unaligned access */
-#define MDP_UAC_MASK	(MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS)
+#define	MDP_UAC_MASK	(MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS)
 
 struct mdproc {
+	u_int	md_uac;			/* Unaligned Access Check flags. */
 };
 
 #endif /* !_MACHINE_PROC_H_ */

==== //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#6 (text+ko) ====

@@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.18 2002/06/02 20:05:41 schweikh Exp $
+ * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.19 2002/07/31 19:37:03 jhb Exp $
  */
 
 #include <sys/param.h>
@@ -631,7 +631,7 @@
 
 	/* save the floating-point state, if necessary, then copy it. */
 	alpha_fpstate_save(td, 1);		/* XXX maybe write=0 */
-	ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED;
+	ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED;
 	bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs,
 	    sizeof(struct fpreg));
 	ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control;

==== //depot/projects/trustedbsd/mac/sys/boot/common/dev_net.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	
- * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.10 2000/11/10 06:37:43 benno Exp $
+ * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.11 2002/07/31 20:17:06 jake Exp $
  * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
  */
 
@@ -209,6 +209,7 @@
 {
     char buf[MAXHOSTNAMELEN];
     char temp[FNAME_SIZE];
+    struct iodesc *d;
     int i;
     n_long smask;
 
@@ -284,6 +285,14 @@
 	    bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1);	    
     }
     printf("net_open: server path: %s\n", rootpath);	    
+
+    d = socktodesc(sock);
+    sprintf(temp, "%6D", d->myea, ":");
+    setenv("boot.netif.ip", inet_ntoa(myip), 1);
+    setenv("boot.netif.netmask", intoa(netmask), 1);
+    setenv("boot.netif.gateway", inet_ntoa(gateip), 1);
+    setenv("boot.netif.hwaddr", temp, 1);
+
     return (0);
 }
 

==== //depot/projects/trustedbsd/mac/sys/conf/files#41 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.678 2002/07/30 22:28:43 imp Exp $
+# $FreeBSD: src/sys/conf/files,v 1.679 2002/08/01 02:03:21 rwatson Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_eisa.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  *
  * $Id$
  *
- * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.23 2002/04/24 16:58:51 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.24 2002/08/01 01:36:30 scottl Exp $
  */
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
@@ -203,13 +203,13 @@
 };
 
 static driver_t ahc_eisa_driver = {
-	"ahc",
+	"ahc_eisa",
 	ahc_eisa_device_methods,
 	sizeof(struct ahc_softc)
 };
 
-static devclass_t ahc_devclass;
+static devclass_t ahc_eisa_devclass;
 
-DRIVER_MODULE(ahc, eisa, ahc_eisa_driver, ahc_devclass, 0, 0);
+DRIVER_MODULE(ahc_eisa, eisa, ahc_eisa_driver, ahc_eisa_devclass, 0, 0);
 MODULE_DEPEND(ahc_eisa, ahc, 1, 1, 1);
 MODULE_VERSION(ahc_eisa, 1);

==== //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_pci.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * $Id$
  *
- * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.45 2002/04/24 16:58:51 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.46 2002/08/01 01:36:30 scottl Exp $
  */
 
 #include <dev/aic7xxx/aic7xxx_osm.h>
@@ -50,15 +50,15 @@
 };
 
 static driver_t ahc_pci_driver = {
-	"ahc",
+	"ahc_pci",
 	ahc_pci_device_methods,
 	sizeof(struct ahc_softc)
 };
 
-static devclass_t ahc_devclass;
+static devclass_t ahc_pci_devclass;
 
-DRIVER_MODULE(ahc, pci, ahc_pci_driver, ahc_devclass, 0, 0);
-DRIVER_MODULE(ahc, cardbus, ahc_pci_driver, ahc_devclass, 0, 0);
+DRIVER_MODULE(ahc_pci, pci, ahc_pci_driver, ahc_pci_devclass, 0, 0);
+DRIVER_MODULE(ahc_pci, cardbus, ahc_pci_driver, ahc_pci_devclass, 0, 0);
 MODULE_DEPEND(ahc_pci, ahc, 1, 1, 1);
 MODULE_VERSION(ahc_pci, 1);
 

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

@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.5 2002/05/19 00:14:47 jhb Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.6 2002/08/01 02:03:20 rwatson Exp $
  */
 
 #include <sys/param.h>

==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#7 (text+ko) ====

@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.43 2002/04/20 01:14:25 rwatson Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.44 2002/08/01 02:03:20 rwatson Exp $
  */
 
 #ifdef _KERNEL

==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#7 (text+ko) ====


==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#10 (text+ko) ====

@@ -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/fs/pseudofs/pseudofs.h,v 1.19 2002/06/06 16:59:24 des Exp $
+ *      $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.20 2002/08/01 01:33:12 rwatson Exp $
  */
 
 #ifndef _PSEUDOFS_H_INCLUDED

==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#16 (text+ko) ====

@@ -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/fs/pseudofs/pseudofs_vnops.c,v 1.29 2002/07/08 01:50:14 jeff Exp $
+ *	$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.30 2002/08/01 01:33:12 rwatson Exp $
  */
 
 #include "opt_mac.h"

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

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/kern/kern_acl.c,v 1.31 2002/07/22 03:57:07 rwatson Exp $
+ * $FreeBSD: src/sys/kern/kern_acl.c,v 1.32 2002/08/01 01:04:16 rwatson Exp $
  */
 /*
  * Developed by the TrustedBSD Project.
@@ -38,6 +38,7 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
+#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>

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

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.68 2002/06/29 01:50:24 alfred Exp $
+ * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.69 2002/08/01 01:07:03 rwatson Exp $
  */
 
 #include "opt_ktrace.h"

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

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/kern/tty_tty.c,v 1.39 2002/03/19 21:24:06 alfred Exp $
+ * $FreeBSD: src/sys/kern/tty_tty.c,v 1.40 2002/08/01 01:09:54 rwatson Exp $
  */
 
 /*
@@ -204,10 +204,8 @@
 		PROC_UNLOCK(td->td_proc);
 		return (error);
 	}
-#ifdef MAC
+	/* XXXMAC: Should this be td->td_ucred below? */
 	/* XXXMAC: Ioctl authorization check here. */
-	/* XXX: Should this be td->td_ucred below? */
-#endif
 	return (VOP_IOCTL(ttyvp, cmd, addr, flag, NOCRED, td));
 }
 

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

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.94 2002/07/31 03:03:22 rwatson Exp $
+ * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.96 2002/08/01 01:18:42 rwatson Exp $
  */
 
 #include "opt_mac.h"
@@ -45,6 +45,7 @@
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>

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

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $FreeBSD: src/sys/kern/vfs_lookup.c,v 1.55 2002/07/24 15:42:22 rwatson Exp $
+ * $FreeBSD: src/sys/kern/vfs_lookup.c,v 1.56 2002/08/01 01:21:40 rwatson Exp $
  */
 
 #include "opt_ktrace.h"
@@ -46,6 +46,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/mac.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>

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

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.273 2002/07/31 01:27:33 rwatson Exp $
+ * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.275 2002/08/01 01:29:03 rwatson Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -50,7 +50,6 @@
 #include <sys/sysent.h>
 #include <sys/mac.h>
 #include <sys/malloc.h>
-#include <sys/mac.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/sysproto.h>

==== //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.29 2002/01/11 15:48:48 ru Exp $
+# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.30 2002/07/31 20:19:28 rwatson Exp $
 
 .PATH:  ${.CURDIR}/../../net
 

==== //depot/projects/trustedbsd/mac/sys/modules/if_tun/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/if_tun/Makefile,v 1.25 2002/01/11 15:48:48 ru Exp $
+# $FreeBSD: src/sys/modules/if_tun/Makefile,v 1.26 2002/07/31 20:19:28 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../net
 

==== //depot/projects/trustedbsd/mac/sys/modules/procfs/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/procfs/Makefile,v 1.26 2002/02/06 10:23:02 des Exp $
+# $FreeBSD: src/sys/modules/procfs/Makefile,v 1.27 2002/08/01 02:03:20 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../fs/procfs
 

==== //depot/projects/trustedbsd/mac/sys/modules/pseudofs/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/pseudofs/Makefile,v 1.2 2002/02/06 10:23:02 des Exp $
+# $FreeBSD: src/sys/modules/pseudofs/Makefile,v 1.3 2002/08/01 01:33:12 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../fs/pseudofs
 

==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#19 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.166 2002/07/22 22:31:09 ru Exp $
+ * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.167 2002/07/31 19:06:49 rwatson Exp $
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
@@ -43,6 +43,7 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>		/* for proc0 declaration */

==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#10 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.65 2002/06/23 21:25:36 luigi Exp $
+ * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.66 2002/07/31 19:06:49 rwatson Exp $
  */
 
 #include "opt_inet6.h"

==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#16 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.138 2002/07/28 19:59:31 truckman Exp $
+ * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.139 2002/07/31 19:06:49 rwatson Exp $
  */
 
 #include "opt_compat.h"
@@ -457,7 +457,8 @@
 	} else {
 		/*
 		 * XXXMAC: This will need to call a mac function that
-		 * modifies the mbuf label in place.
+		 * modifies the mbuf label in place for TCP datagrams
+		 * not associated with a PCB.
 		 */
 	}
 #endif

==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#13 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.23 2002/06/28 19:12:38 jlemon Exp $
+ * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.24 2002/07/31 19:06:49 rwatson Exp $
  */
 
 #include "opt_inet6.h"

==== //depot/projects/trustedbsd/mac/sys/pccard/pccard_nbk.c#5 (text+ko) ====

@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pccard/pccard_nbk.c,v 1.41 2002/07/17 05:50:06 imp Exp $
+ * $FreeBSD: src/sys/pccard/pccard_nbk.c,v 1.42 2002/07/31 20:01:11 imp Exp $
  */
 
 /*
@@ -119,7 +119,7 @@
 static int
 pccard_probe(device_t dev)
 {
-	device_set_desc(dev, "PC Card bus (classic)");
+	device_set_desc(dev, "PC Card 16-bit bus (classic)");
 	return (0);
 }
 

==== //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#8 (text+ko) ====


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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message