From owner-cvs-src@FreeBSD.ORG Fri Sep 1 14:51:29 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1EA416A4DF; Fri, 1 Sep 2006 14:51:29 +0000 (UTC) (envelope-from lothrandil@n00b.apagnu.se) Received: from pne-smtpout1-sn2.hy.skanova.net (pne-smtpout1-sn2.hy.skanova.net [81.228.8.83]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AC6543D49; Fri, 1 Sep 2006 14:51:28 +0000 (GMT) (envelope-from lothrandil@n00b.apagnu.se) Received: from [90.224.60.58] (90.224.60.58) by pne-smtpout1-sn2.hy.skanova.net (7.2.075) id 44F471DC000F4D09; Fri, 1 Sep 2006 16:51:28 +0200 Message-ID: <44F848E5.8080203@n00b.apagnu.se> Date: Fri, 01 Sep 2006 16:51:17 +0200 From: Niclas Zeising User-Agent: Thunderbird 1.5.0.5 (Windows/20060719) MIME-Version: 1.0 To: Wayne Salamon References: <200609011145.k81BjeRZ029152@repoman.freebsd.org> In-Reply-To: <200609011145.k81BjeRZ029152@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/bsm audit_record.h src/sys/kern kern_exec.c src/sys/security/audit audit.c audit.h audit_arg.c audit_bsm.c audit_bsm_token.c audit_private.h audit_syscalls.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2006 14:51:29 -0000 Wayne Salamon wrote: > wsalamon 2006-09-01 11:45:40 UTC > > FreeBSD src repository > > Modified files: > sys/bsm audit_record.h > sys/kern kern_exec.c > sys/security/audit audit.c audit.h audit_arg.c audit_bsm.c > audit_bsm_token.c audit_private.h > audit_syscalls.c > Log: > Audit the argv and env vectors passed in on exec: > Add the argument auditing functions for argv and env. > Add kernel-specific versions of the tokenizer functions for the > arg and env represented as a char array. > Implement the AUDIT_ARGV and AUDIT_ARGE audit policy commands to > enable/disable argv/env auditing. > Call the argument auditing from the exec system calls. > > Obtained from: TrustedBSD Project > Approved by: rwatson (mentor) > > Revision Changes Path > 1.5 +7 -2 src/sys/bsm/audit_record.h > 1.295 +9 -0 src/sys/kern/kern_exec.c > 1.18 +8 -0 src/sys/security/audit/audit.c > 1.8 +5 -0 src/sys/security/audit/audit.h > 1.6 +42 -0 src/sys/security/audit/audit_arg.c > 1.10 +14 -1 src/sys/security/audit/audit_bsm.c > 1.7 +56 -8 src/sys/security/audit/audit_bsm_token.c > 1.10 +6 -0 src/sys/security/audit/audit_private.h > 1.5 +8 -1 src/sys/security/audit/audit_syscalls.c This commit seems to have blown up the build. This is from my buildlog: ===> lib/libbsm (all) cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_audit.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_class.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_control.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_event.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_flags.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_io.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_mask.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_notify.c cc -O2 -fno-strict-aliasing -pipe -march=pentium4 -I/usr/src/lib/libbsm/../../contrib/openbsm -I/usr/src/lib/libbsm/../../contrib/openbsm/libbsm -c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_token.c /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_token.c:1059: error: conflicting types for 'au_to_exec_args' /usr/obj/usr/src/tmp/usr/include/bsm/audit_record.h:326: error: previous declaration of 'au_to_exec_args' was here /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_token.c:1059: error: conflicting types for 'au_to_exec_args' /usr/obj/usr/src/tmp/usr/include/bsm/audit_record.h:326: error: previous declaration of 'au_to_exec_args' was here /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_token.c:1100: error: conflicting types for 'au_to_exec_env' /usr/obj/usr/src/tmp/usr/include/bsm/audit_record.h:327: error: previous declaration of 'au_to_exec_env' was here /usr/src/lib/libbsm/../../contrib/openbsm/libbsm/bsm_token.c:1100: error: conflicting types for 'au_to_exec_env' /usr/obj/usr/src/tmp/usr/include/bsm/audit_record.h:327: error: previous declaration of 'au_to_exec_env' was here *** Error code 1 Stop in /usr/src/lib/libbsm. *** Error code 1 Stop in /usr/src/lib. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. *** Error code 1