PERFORCE change 75735 for review

[Robert Watson]

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

Change 75735 by rwatson at rwatson_paprika on 2005/04/22 19:17:57

	Replicate from TrustedBSD: Don't expose struct socket to userspace,
	but do it in a FreeBSD or Darwin way.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit.h#2 edit
.. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#2 (text+ko) ====

@@ -24,9 +24,9 @@
 #ifndef _BSM_AUDIT_H
 #define	_BSM_AUDIT_H
 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/ucred.h>
-#include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/socket.h>
 #include <sys/cdefs.h>

==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#2 (text+ko) ====

@@ -281,11 +281,13 @@
 token_t			*au_to_return32(char status, u_int32_t ret);
 token_t			*au_to_return64(char status, u_int64_t ret);
 token_t			*au_to_seq(long audit_count);
+#if defined(_KERNEL) || defined(KERNEL)
 token_t			*au_to_socket(struct socket *so);
 token_t			*au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, 
 				struct sockaddr *la, struct sockaddr *ta);
 token_t			*au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, 
 				struct sockaddr *la, struct sockaddr *ta);
+#endif
 token_t			*au_to_sock_inet(struct sockaddr_in *so);
 token_t			*au_to_sock_inet32(struct sockaddr_in *so);
 token_t			*au_to_sock_inet128(struct sockaddr_in6 *so);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message