PERFORCE change 120624 for review

[Robert Watson]

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

Change 120624 by rwatson at rwatson_zoo on 2007/05/30 13:41:06

	Integrate TrustedBSD base branch from FreeBSD CVS HEAD:
	
	- Further cleanup/synchronization of kernel audit code.

Affected files ...

.. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#13 integrate

Differences ...

==== //depot/projects/trustedbsd/base/sys/security/audit/audit.h#7 (text) ====

@@ -26,7 +26,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.h,v 1.10 2007/04/13 14:55:19 csjp Exp $
+ * $FreeBSD: src/sys/security/audit/audit.h,v 1.11 2007/05/30 11:41:28 rwatson Exp $
  */
 
 /*
@@ -214,10 +214,6 @@
 
 #else /* !AUDIT */
 
-void	 audit_proc_init(struct proc *p);
-void	 audit_proc_fork(struct proc *parent, struct proc *child);
-void	 audit_proc_free(struct proc *p);
-
 #define	AUDIT_ARG(op, args...)	do {					\
 } while (0)
 

==== //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#10 (text) ====

@@ -30,7 +30,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_bsm_token.c,v 1.12 2007/04/17 12:24:18 rwatson Exp $
+ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.13 2007/05/30 09:48:37 rwatson Exp $
  */
 
 #include <sys/types.h>
@@ -688,6 +688,7 @@
                 ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t));
         else
                 ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t));
+
 	return (t);
 }
 
@@ -1070,6 +1071,7 @@
 		ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t));
 	else    
 		ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t));
+
 	return (t);
 }
 

==== //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#13 (text) ====

@@ -26,7 +26,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_syscalls.c,v 1.15 2007/05/30 08:39:16 rwatson Exp $
+ * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.16 2007/05/30 11:41:28 rwatson Exp $
  */
 
 #include "opt_mac.h"
@@ -747,23 +747,4 @@
 
 	return (ENOSYS);
 }
-
-void
-audit_proc_init(struct proc *p)
-{
-
-}
-
-void
-audit_proc_fork(struct proc *parent, struct proc *child)
-{
-
-}
-
-void
-audit_proc_free(struct proc *p)
-{
-
-}
-
 #endif /* AUDIT */