PERFORCE change 154515 for review
Stacey Son
sson at FreeBSD.org
Thu Dec 11 12:52:08 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=154515
Change 154515 by sson at 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 at am__append_1 = \
- at HAVE_AUDIT_SYSCALLS_TRUE@ auditd \
- at HAVE_AUDIT_SYSCALLS_TRUE@ audit
+ at HAVE_AUDIT_SYSCALLS_TRUE@ audit \
+ at 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 at audit_SOURCES = audit.c
@USE_MACH_IPC_TRUE at audit_SOURCES = auditd_controlUser.c audit.c
- at USE_MACH_IPC_TRUE@CLEANFILES = auditd_controlUser.c auditd_controlUser.h
+ at USE_MACH_IPC_TRUE@CLEANFILES = auditd_controlUser.c auditd_control.h
all: all-am
.SUFFIXES:
@@ -521,8 +521,8 @@
uninstall-sbinPROGRAMS
- at USE_MACH_IPC_TRUE@auditd_controlUser.c auditd_controlUser.h: $(top_srcdir)/bin/auditd/auditd_control.defs
- at 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
+ at USE_MACH_IPC_TRUE@auditd_controlUser.c auditd_control.h: $(top_srcdir)/bin/auditd/auditd_control.defs
+ at 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 <sys/types.h>
@@ -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;
/*
More information about the p4-projects
mailing list