PERFORCE change 167139 for review

[Robert Watson]

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

Change 167139 by rwatson at rwatson_freebsd_capabilities on 2009/08/09 18:39:37

	Update capabilities-related code to use revised in-kernel syscall
	argument auditing interfaces.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#26 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#26 (text+ko) ====

@@ -50,7 +50,7 @@
 #include "opt_capabilities.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#25 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#26 $");
 
 #include <sys/param.h>
 #include <sys/capability.h>
@@ -282,8 +282,8 @@
 	struct file *fp, *fp_cap, *fp_object;
 	int error, fd_cap;
 
-	AUDIT_ARG(fd, uap->fd);
-	AUDIT_ARG(rights, uap->rights);
+	AUDIT_ARG_FD(uap->fd);
+	AUDIT_ARG_RIGHTS(uap->rights);
 	if ((uap->rights | CAP_MASK_VALID) != CAP_MASK_VALID)
 		return (EINVAL);
 
@@ -298,7 +298,7 @@
 	if (error)
 		goto fail;
 
-	AUDIT_ARG(file, td->td_proc, fp);
+	AUDIT_ARG_FILE(td->td_proc, fp);
 
 	/*
 	 * If a new capability is being derived from an existing capability,
@@ -367,7 +367,7 @@
 	struct file *fp;
 	int error;
 
-	AUDIT_ARG(fd, uap->fd);
+	AUDIT_ARG_FD(uap->fd);
 	error = fgetcap(td, uap->fd, &fp);
 	if (error)
 		return (error);

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#12 (text+ko) ====

@@ -196,14 +196,14 @@
 	pid_t pid;
 	int error;
 
-	AUDIT_ARG(fd, uap->fd);
+	AUDIT_ARG_FD(uap->fd);
 	error = fget(td, uap->fd, CAP_PDGETPID, &fp);
 	if (error)
 		return (error);
 	if (fp->f_type == DTYPE_PROCDESC) {
 		pd = fp->f_data;
 		pid = pd->pd_pid;
-		AUDIT_ARG(pid, pid);
+		AUDIT_ARG_PID(pid);
 	} else
 		error = EBADF;
 	fdrop(fp, td);