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

[Niclas Zeising]

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