Assign audit event identifiers to ibcs2 ISC system calls.

Obtained from:	TrustedBSD Project

2 files changed, 29 insertions, 28 deletions

diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index 4589e98..a949560 100644
--- a/sys/i386/ibcs2/ibcs2_isc_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_isc_sysent.c
@@ -21,23 +21,23 @@
 struct sysent isc_sysent[] = {
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 0 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 1 = isc_setostype */
-	{ SYF_MPSAFE | AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename, AUE_NULL },	/* 2 = ibcs2_rename */
+	{ SYF_MPSAFE | AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename, AUE_RENAME },	/* 2 = ibcs2_rename */
 	{ SYF_MPSAFE | AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_NULL },	/* 3 = ibcs2_sigaction */
-	{ SYF_MPSAFE | AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL },	/* 4 = ibcs2_sigprocmask */
+	{ AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL },	/* 4 = ibcs2_sigprocmask */
 	{ SYF_MPSAFE | AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_NULL },	/* 5 = ibcs2_sigpending */
-	{ SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_NULL },	/* 6 = getgroups */
-	{ SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_NULL },	/* 7 = setgroups */
-	{ SYF_MPSAFE | AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf, AUE_NULL },	/* 8 = ibcs2_pathconf */
-	{ SYF_MPSAFE | AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf, AUE_NULL },	/* 9 = ibcs2_fpathconf */
+	{ SYF_MPSAFE | AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS },	/* 6 = getgroups */
+	{ SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS },	/* 7 = setgroups */
+	{ SYF_MPSAFE | AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf, AUE_PATHCONF },	/* 8 = ibcs2_pathconf */
+	{ SYF_MPSAFE | AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf, AUE_FPATHCONF },	/* 9 = ibcs2_fpathconf */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 10 = nosys */
-	{ SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_NULL },	/* 11 = ibcs2_wait */
-	{ SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL },	/* 12 = setsid */
-	{ SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL },	/* 13 = getpid */
+	{ SYF_MPSAFE | AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4 },	/* 11 = ibcs2_wait */
+	{ SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID },	/* 12 = setsid */
+	{ SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID },	/* 13 = getpid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 14 = isc_adduser */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 15 = isc_setuser */
 	{ SYF_MPSAFE | AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf, AUE_NULL },	/* 16 = ibcs2_sysconf */
 	{ SYF_MPSAFE | AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_NULL },	/* 17 = ibcs2_sigsuspend */
-	{ SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_NULL },	/* 18 = ibcs2_symlink */
-	{ SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_NULL },	/* 19 = ibcs2_readlink */
+	{ SYF_MPSAFE | AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK },	/* 18 = ibcs2_symlink */
+	{ SYF_MPSAFE | AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK },	/* 19 = ibcs2_readlink */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 20 = isc_getmajor */
 };
diff --git a/sys/i386/ibcs2/syscalls.isc b/sys/i386/ibcs2/syscalls.isc
index 40892e6..abf0b18 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -10,28 +10,29 @@
 
 0	AUE_NULL	UNIMPL	nosys
 1	AUE_NULL	UNIMPL	isc_setostype
-2	AUE_NULL	MNOPROTO	{ int ibcs2_rename(char *from, char *to); }
+2	AUE_RENAME	MNOPROTO	{ int ibcs2_rename(char *from, char *to); }
 3	AUE_NULL	MNOPROTO	{ int ibcs2_sigaction(int sig, \
-			    struct ibcs2_sigaction *act, \
-			    struct ibcs2_sigaction *oact); }
-4	AUE_NULL	MNOPROTO	{ int ibcs2_sigprocmask(int how, \
-			    ibcs2_sigset_t *set, ibcs2_sigset_t *oset); }
+				    struct ibcs2_sigaction *act, \
+				    struct ibcs2_sigaction *oact); }
+4	AUE_NULL	NOPROTO	{ int ibcs2_sigprocmask(int how, \
+				    ibcs2_sigset_t *set, \
+				    ibcs2_sigset_t *oset); }
 5	AUE_NULL	MNOPROTO	{ int ibcs2_sigpending(ibcs2_sigset_t *mask); }
-6	AUE_NULL	MNOPROTO	{ int getgroups(u_int gidsetsize, \
-			    gid_t *gidset); }
-7	AUE_NULL	MNOPROTO	{ int setgroups(u_int gidsetsize, \
-			    gid_t *gidset); }
-8	AUE_NULL	MNOPROTO	{ int ibcs2_pathconf(char *path, int name); }
-9	AUE_NULL	MNOPROTO	{ int ibcs2_fpathconf(int fd, int name); }
+6	AUE_GETGROUPS	MNOPROTO	{ int getgroups(u_int gidsetsize, \
+				    gid_t *gidset); }
+7	AUE_SETGROUPS	MNOPROTO	{ int setgroups(u_int gidsetsize, \
+				    gid_t *gidset); }
+8	AUE_PATHCONF	MNOPROTO	{ int ibcs2_pathconf(char *path, int name); }
+9	AUE_FPATHCONF	MNOPROTO	{ int ibcs2_fpathconf(int fd, int name); }
 10	AUE_NULL	UNIMPL	nosys
-11	AUE_NULL	MNOPROTO	{ int ibcs2_wait(int a1, int a2, int a3); }
-12	AUE_NULL	MNOPROTO	{ int setsid(void); }
-13	AUE_NULL	MNOPROTO	{ pid_t getpid(void); }
+11	AUE_WAIT4	MNOPROTO	{ int ibcs2_wait(int a1, int a2, int a3); }
+12	AUE_SETSID	MNOPROTO	{ int setsid(void); }
+13	AUE_GETPID	MNOPROTO	{ pid_t getpid(void); }
 14	AUE_NULL	UNIMPL	isc_adduser
 15	AUE_NULL	UNIMPL	isc_setuser
 16	AUE_NULL	MNOPROTO { int ibcs2_sysconf(int name); }
 17	AUE_NULL	MNOPROTO	{ int ibcs2_sigsuspend(ibcs2_sigset_t *mask); }
-18	AUE_NULL	MNOPROTO	{ int ibcs2_symlink(char *path, char *link); }
-19	AUE_NULL	MNOPROTO	{ int ibcs2_readlink(char *path, char *buf, \
-			    int count); }
+18	AUE_SYMLINK	MNOPROTO	{ int ibcs2_symlink(char *path, char *link); }
+19	AUE_READLINK	MNOPROTO	{ int ibcs2_readlink(char *path, char *buf, \
+				    int count); }
 20	AUE_NULL	UNIMPL	isc_getmajor