PERFORCE change 98574 for review

[Robert Watson]

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

Change 98574 by rwatson at rwatson_zoo on 2006/06/05 15:50:46

	Integrate TrustedBSD base branch to loop back various audit
	changes:
	
	- audit.4 -> audit.4 + auditpipe.4, documentation of preselection,
	  etc.
	- Some auditing of mount-related arguments (only simple ones
	  merged).
	- Use uma_zfree() on audit records.
	
	Also merge:
	
	- if_le works with vmware again

Affected files ...

.. //depot/projects/trustedbsd/audit3/lib/libc/i386/gen/_ctx_start.S#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#11 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#3 integrate
.. //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#5 integrate
.. //depot/projects/trustedbsd/audit3/sys/dev/le/if_le_pci.c#3 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#15 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#31 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/lib/libc/i386/gen/_ctx_start.S#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.3 2004/07/02 14:19:44 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.4 2006/06/05 14:59:33 kib Exp $");
 
 /*
  * _ctx_start((void *func)(int arg1, ..., argn),
@@ -41,10 +41,11 @@
 ENTRY(_ctx_start)
 	popl	%eax		/* get start function */
 	call	*%eax		/* call start function */
+	PIC_PROLOGUE
 	movl	%esi, %esp	/*
 				 * setup stack for completion routine;
 				 * ucp is now at top of stack
 				 */
-	call	_ctx_done	/* should never return */
-	call	abort		/* fubar */
+	call	PIC_PLT(_ctx_done)	/* should never return */
+	call	PIC_PLT(abort)		/* fubar */
 	ret

==== //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.351 2006/05/20 06:21:42 brueffer Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.352 2006/06/05 15:26:09 rwatson Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -29,6 +29,7 @@
 	atkbd.4 \
 	atkbdc.4 \
 	audit.4 \
+	auditpipe.4 \
 	aue.4 \
 	awi.4 \
 	axe.4 \

==== //depot/projects/trustedbsd/audit3/share/man/man4/audit.4#3 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/audit.4,v 1.6 2006/02/06 20:27:00 rwatson Exp $
+.\" $FreeBSD: src/share/man/man4/audit.4,v 1.7 2006/06/05 15:26:09 rwatson Exp $
 .\"
 .Dd May 5, 2006
 .Os

==== //depot/projects/trustedbsd/audit3/share/man/man4/auditpipe.4#5 (text+ko) ====


==== //depot/projects/trustedbsd/audit3/sys/dev/le/if_le_pci.c#3 (text+ko) ====

@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.3 2006/05/16 21:04:01 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.4 2006/06/05 15:14:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -263,8 +263,16 @@
 le_pci_hwreset(struct lance_softc *sc)
 {
 
-	/* Chip is stopped. Set software style to ILACC (32-bit). */
-	le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_ILACC);
+	/*
+	 * Chip is stopped. Set software style to PCnet-PCI (32-bit).
+	 * Actually, am79900.c implements ILACC support (hence its
+	 * name) but unfortunately VMware does not. As far as this
+	 * driver is concerned that should not make a difference
+	 * though, as the settings used have the same meaning for
+	 * both, ILACC and PCnet-PCI (note that there would be a
+	 * difference for the ADD_FCS/NO_FCS bit if used).
+	 */
+	le_pci_wrbcr(sc, LE_BCR20, LE_B20_SSTYLE_PCNETPCI2);
 }
 
 static void

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

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.226 2006/06/02 20:29:02 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.227 2006/06/05 15:32:07 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -65,6 +65,8 @@
 
 #include <machine/stdarg.h>
 
+#include <security/audit/audit.h>
+
 #include "opt_rootdevname.h"
 #include "opt_ddb.h"
 #include "opt_mac.h"

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

@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/audit/audit.c,v 1.15 2006/06/05 14:48:17 rwatson Exp $
+ * $FreeBSD: src/sys/security/audit/audit.c,v 1.16 2006/06/05 15:38:12 rwatson Exp $
  */
 
 #include <sys/param.h>