PERFORCE change 82114 for review

[Wayne Salamon]

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

Change 82114 by wsalamon at gretsch on 2005/08/17 11:53:23

	Change the kernel to use STAT events for the N?STAT calls, and remove
	the NSTAT, NFSTAT and NLSTAT events.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#8 integrate
.. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#18 edit
.. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#21 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#8 (text+ko) ====

@@ -303,9 +303,6 @@
 #define	AUE_FHOPEN		373	/* FreeBSD */
 #define	AUE_FHSTAT		374	/* FreeBSD */
 #define	AUE_JAIL		375	/* FreeBSD */
-#define	AUE_NSTAT		376	/* FreeBSD/NetBSD */
-#define	AUE_NFSTAT		377	/* FreeBSD/NetBSD */
-#define	AUE_NLSTAT		378	/* FreeBSD/NetBSD */
 
 /*
  * XXXRW: Values not yet assigned.

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

@@ -307,9 +307,9 @@
 	{ AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN },	/* 275 = netbsd_lchown */
 	{ SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES },	/* 276 = lutimes */
 	{ SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC },	/* 277 = netbsd_msync */
-	{ SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_NSTAT },	/* 278 = nstat */
-	{ SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_NFSTAT },	/* 279 = nfstat */
-	{ SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_NLSTAT },	/* 280 = nlstat */
+	{ SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_STAT },	/* 278 = nstat */
+	{ SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT },	/* 279 = nfstat */
+	{ SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT },	/* 280 = nlstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 281 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 282 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 283 = nosys */

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

@@ -490,9 +490,9 @@
 				    struct timeval *tptr); }
 277	AUE_MSYNC	MNOPROTO	{ int msync(void *addr, size_t len, \
 				    int flags); } netbsd_msync msync_args int
-278	AUE_NSTAT	MSTD	{ int nstat(char *path, struct nstat *ub); }
-279	AUE_NFSTAT	MSTD	{ int nfstat(int fd, struct nstat *sb); }
-280	AUE_NLSTAT	MSTD	{ int nlstat(char *path, struct nstat *ub); }
+278	AUE_STAT	MSTD	{ int nstat(char *path, struct nstat *ub); }
+279	AUE_FSTAT	MSTD	{ int nfstat(int fd, struct nstat *sb); }
+280	AUE_LSTAT	MSTD	{ int nlstat(char *path, struct nstat *ub); }
 281	AUE_NULL	UNIMPL	nosys
 282	AUE_NULL	UNIMPL	nosys
 283	AUE_NULL	UNIMPL	nosys

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

@@ -581,8 +581,6 @@
 	case AUE_GETFH:
 	case AUE_LSTAT:
 	case AUE_MKFIFO:
-	case AUE_NLSTAT:
-	case AUE_NSTAT:
 	case AUE_PATHCONF:
 	case AUE_READLINK:
 	case AUE_REVOKE:
@@ -646,7 +644,6 @@
 	case AUE_FUTIMES:
 	case AUE_GETDIRENTRIES:
 	case AUE_GETDIRENTRIESATTR:
-	case AUE_NFSTAT:
 		FD_KPATH1_VNODE1_TOKENS;
 		break;