svn commit: r195235 - in head/sys: kern security/audit

[Robert Watson]

Author: rwatson
Date: Wed Jul  1 12:36:10 2009
New Revision: 195235
URL: http://svn.freebsd.org/changeset/base/195235

Log:
  udit the 'options' argument to wait4(2).
  
  Approved by:	re (kib)
  MFC after:	3 days

Modified:
  head/sys/kern/kern_exit.c
  head/sys/security/audit/audit_bsm.c

Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c	Wed Jul  1 10:16:10 2009	(r195234)
+++ head/sys/kern/kern_exit.c	Wed Jul  1 12:36:10 2009	(r195235)
@@ -804,6 +804,7 @@ kern_wait(struct thread *td, pid_t pid, 
 	int error, nfound;
 
 	AUDIT_ARG_PID(pid);
+	AUDIT_ARG_VALUE(options);
 
 	q = td->td_proc;
 	if (pid == 0) {

Modified: head/sys/security/audit/audit_bsm.c
==============================================================================
--- head/sys/security/audit/audit_bsm.c	Wed Jul  1 10:16:10 2009	(r195234)
+++ head/sys/security/audit/audit_bsm.c	Wed Jul  1 12:36:10 2009	(r195235)
@@ -1498,6 +1498,10 @@ kaudit_to_bsm(struct kaudit_record *kar,
 			tok = au_to_arg32(0, "pid", ar->ar_arg_pid);
 			kau_write(rec, tok);
 		}
+		if (ARG_IS_VALID(kar, ARG_VALUE)) {
+			tok = au_to_arg32(0, "options", ar->ar_arg_value);
+			kau_write(rec, tok);
+		}
 		break;
 
 	case AUE_NULL: