From owner-p4-projects@FreeBSD.ORG Thu Dec 11 20:52:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D6C5106567A; Thu, 11 Dec 2008 20:52:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C57FC1065670 for ; Thu, 11 Dec 2008 20:52:07 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B47E98FC18 for ; Thu, 11 Dec 2008 20:52:07 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBKq7eV090292 for ; Thu, 11 Dec 2008 20:52:07 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBBKq79a090290 for perforce@freebsd.org; Thu, 11 Dec 2008 20:52:07 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 11 Dec 2008 20:52:07 GMT Message-Id: <200812112052.mBBKq79a090290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 154515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 20:52:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=154515 Change 154515 by sson@sson_amd64 on 2008/12/11 20:52:06 Changes to silence compile time warnings: - Added missing prototypes for au_bsm_to_errno(), au_errno_to_bsm(), and auditd_set_host(). - Made parse_object_type() static. - Added default case in switch for au_assemble(). Fixed mig problem with Mac OS X build using xcode. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#6 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 edit .. //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#38 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#33 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -36,8 +36,8 @@ build_triplet = @build@ host_triplet = @host@ @HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ -@HAVE_AUDIT_SYSCALLS_TRUE@ auditd \ -@HAVE_AUDIT_SYSCALLS_TRUE@ audit +@HAVE_AUDIT_SYSCALLS_TRUE@ audit \ +@HAVE_AUDIT_SYSCALLS_TRUE@ auditd subdir = bin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -61,7 +61,7 @@ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = auditfilterd auditreduce praudit auditd audit +DIST_SUBDIRS = auditfilterd auditreduce praudit audit auditd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#5 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#6 $ # if USE_NATIVE_INCLUDES @@ -14,10 +14,10 @@ if USE_MACH_IPC audit_SOURCES = auditd_controlUser.c audit.c -CLEANFILES = auditd_controlUser.c auditd_controlUser.h +CLEANFILES = auditd_controlUser.c auditd_control.h -auditd_controlUser.c auditd_controlUser.h: $(top_srcdir)/bin/auditd/auditd_control.defs - $(MIG) -user auditd_controlUser.c -header auditd_controlUser.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs +auditd_controlUser.c auditd_control.h: $(top_srcdir)/bin/auditd/auditd_control.defs + $(MIG) -user auditd_controlUser.c -header auditd_control.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs else audit_SOURCES = audit.c endif ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#10 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 $ # VPATH = @srcdir@ @@ -189,7 +189,7 @@ man8_MANS = audit.8 @USE_MACH_IPC_FALSE@audit_SOURCES = audit.c @USE_MACH_IPC_TRUE@audit_SOURCES = auditd_controlUser.c audit.c -@USE_MACH_IPC_TRUE@CLEANFILES = auditd_controlUser.c auditd_controlUser.h +@USE_MACH_IPC_TRUE@CLEANFILES = auditd_controlUser.c auditd_control.h all: all-am .SUFFIXES: @@ -521,8 +521,8 @@ uninstall-sbinPROGRAMS -@USE_MACH_IPC_TRUE@auditd_controlUser.c auditd_controlUser.h: $(top_srcdir)/bin/auditd/auditd_control.defs -@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_controlUser.c -header auditd_controlUser.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@auditd_controlUser.c auditd_control.h: $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_controlUser.c -header auditd_control.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 (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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 $ */ /* @@ -567,7 +567,7 @@ * The -o option has the form object_type=object_value. Identify the object * components. */ -void +static void parse_object_type(char *name, char *val) { if (val == NULL) ==== //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 (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. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -93,6 +93,7 @@ int auditd_set_namask(void); int auditd_set_policy(void); int auditd_set_fsize(void); +int auditd_set_host(void); int auditd_swap_trail(char *TS, char **newfile, gid_t gid, int (*warn_getacdir)(char *)); int auditd_prevent_audit(void); ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#38 (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. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#38 $ */ #ifndef _LIBBSM_H_ @@ -826,6 +826,8 @@ /* * Functions relating to BSM<->errno conversion. */ +int au_bsm_to_errno(u_char bsm_error, int *errorp); +u_char au_errno_to_bsm(int error); char *au_strerror(u_char bsm_error); /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#33 (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. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#33 $ */ #include @@ -242,6 +242,8 @@ (IN6_IS_ADDR_UNSPECIFIED(aptr)) ? AUDIT_HEADER_SIZE : AUDIT_HEADER_EX_SIZE(&aia); break; + default: + return (-1); } tot_rec_size = rec->len + hdrsize + AUDIT_TRAILER_SIZE; /*