Date: Wed, 30 May 2007 13:42:16 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 120625 for review Message-ID: <200705301342.l4UDgGfD067797@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=120625 Change 120625 by rwatson@rwatson_zoo on 2007/05/30 13:41:51 Integrate TrustedBSD audit3 branch from TrustedBSD base: minor kernel audit synchronization. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#34 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#39 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#24 (text+ko) ==== @@ -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 $ */ /* ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#34 (text+ko) ==== @@ -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> ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#39 (text+ko) ==== @@ -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 $ */ /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705301342.l4UDgGfD067797>