Date: Sun, 18 Nov 2012 19:50:17 GMT From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219804 for review Message-ID: <201211181950.qAIJoHam031886@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@219804?ac=10 Change 219804 by pjd@pjd_anger on 2012/11/18 19:49:22 Merge my work on auditdistd. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.am#5 integrate .. //depot/projects/trustedbsd/openbsm/Makefile.in#13 integrate .. //depot/projects/trustedbsd/openbsm/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/openbsm/autogen.sh#2 integrate .. //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 integrate .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#14 integrate .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#7 integrate .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#15 integrate .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#6 integrate .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#14 integrate .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#50 integrate .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/Makefile.am#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/Makefile.in#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.8#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.conf.5#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/faccessat.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/fstatat.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/openat.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_common.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_impl.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_socketpair.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/renameat.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sigtimedwait.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/strndup.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/unlinkat.h#1 branch .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#4 integrate .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#11 integrate .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#4 integrate .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#13 integrate .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#4 integrate .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#13 integrate .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#5 integrate .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#13 integrate .. //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#5 integrate .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#50 integrate .. //depot/projects/trustedbsd/openbsm/compat/closefrom.h#1 branch .. //depot/projects/trustedbsd/openbsm/compat/compat.h#1 branch .. //depot/projects/trustedbsd/openbsm/compat/endian.h#10 integrate .. //depot/projects/trustedbsd/openbsm/compat/flopen.h#1 branch .. //depot/projects/trustedbsd/openbsm/compat/pidfile.h#1 branch .. //depot/projects/trustedbsd/openbsm/config/config.h.in#23 integrate .. //depot/projects/trustedbsd/openbsm/configure#64 integrate .. //depot/projects/trustedbsd/openbsm/configure.ac#62 integrate .. //depot/projects/trustedbsd/openbsm/etc/audit_control#9 integrate .. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#3 integrate .. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#6 integrate .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#18 integrate .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#10 integrate .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#18 integrate .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#17 integrate .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#41 integrate .. //depot/projects/trustedbsd/openbsm/man/Makefile.am#2 integrate .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#12 integrate .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#26 integrate .. //depot/projects/trustedbsd/openbsm/modules/Makefile.am#2 integrate .. //depot/projects/trustedbsd/openbsm/modules/Makefile.in#10 integrate .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.am#4 integrate .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#11 integrate .. //depot/projects/trustedbsd/openbsm/sys/Makefile.am#2 integrate .. //depot/projects/trustedbsd/openbsm/sys/Makefile.in#7 integrate .. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.am#5 integrate .. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#10 integrate .. //depot/projects/trustedbsd/openbsm/test/Makefile.am#3 integrate .. //depot/projects/trustedbsd/openbsm/test/Makefile.in#11 integrate .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.am#4 integrate .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#11 integrate .. //depot/projects/trustedbsd/openbsm/tools/Makefile.am#5 integrate .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#14 integrate Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.am#5 (text+ko) ==== @@ -1,6 +1,6 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#4 $ -# +## +## $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#5 $ +## SUBDIRS = \ bsm @@ -17,6 +17,7 @@ modules \ sys +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ CHANGELOG \ ==== //depot/projects/trustedbsd/openbsm/Makefile.in#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. +# Makefile.in generated by automake 1.12.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -13,10 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#12 $ -# VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -64,7 +60,8 @@ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ $(top_srcdir)/config/missing $(top_srcdir)/configure INSTALL \ NEWS TODO config/config.guess config/config.sub config/depcomp \ - config/install-sh config/ltmain.sh config/missing + config/install-sh config/ltmain.sh config/missing \ + config/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -172,6 +169,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -203,6 +203,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -241,6 +243,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -255,6 +258,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ CHANGELOG \ LICENSE \ @@ -330,7 +334,7 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS): +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -340,7 +344,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -354,37 +362,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -604,9 +581,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ==== //depot/projects/trustedbsd/openbsm/aclocal.m4#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.12.1 -*- Autoconf -*- +# generated automatically by aclocal 1.12.4 -*- Autoconf -*- # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -8612,8 +8612,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -8623,7 +8621,7 @@ [am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.1], [], +m4_if([$1], [1.12.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8639,7 +8637,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.1])dnl +[AM_AUTOMAKE_VERSION([1.12.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -8652,8 +8650,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to # '$srcdir', '$srcdir/..', or '$srcdir/../..'. @@ -8707,8 +8703,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -8740,7 +8734,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 17 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -8932,7 +8925,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -9009,8 +9001,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 19 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -9085,6 +9075,11 @@ AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>; +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>; +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -9157,8 +9152,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -9180,8 +9173,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -9204,8 +9195,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. @@ -9243,8 +9232,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -9295,8 +9282,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -9304,7 +9289,6 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ # Define MISSING if not defined so far and test if it supports --run. @@ -9337,8 +9321,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -9370,8 +9352,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -9453,8 +9433,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor 'install' (even GNU) is that you can't @@ -9483,8 +9461,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -9504,8 +9480,6 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. ==== //depot/projects/trustedbsd/openbsm/autogen.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/autogen.sh#2 $ # libtoolize --copy --force ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 (text+ko) ==== @@ -1,8 +1,9 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#3 $ -# +## +## $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#4 $ +## SUBDIRS = \ + auditdistd \ auditfilterd \ auditreduce \ praudit ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. +# Makefile.in generated by automake 1.12.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -13,10 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#13 $ -# VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -88,7 +84,8 @@ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = auditfilterd auditreduce praudit audit auditd +DIST_SUBDIRS = auditdistd auditfilterd auditreduce praudit audit \ + auditd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -147,6 +144,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -178,6 +178,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -216,6 +218,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -229,7 +232,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = auditfilterd auditreduce praudit $(am__append_1) +SUBDIRS = auditdistd auditfilterd auditreduce praudit $(am__append_1) all: all-recursive .SUFFIXES: @@ -276,7 +279,7 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS): +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -286,7 +289,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -300,37 +307,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#7 (text+ko) ==== @@ -1,6 +1,6 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#6 $ -# +## +## $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#7 $ +## if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. +# Makefile.in generated by automake 1.12.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -14,10 +14,6 @@ @SET_MAKE@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#14 $ -# - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -159,6 +155,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -190,6 +189,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -228,6 +229,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#6 (text+ko) ==== @@ -1,6 +1,6 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#5 $ -# +## +## $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#6 $ +## if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. +# Makefile.in generated by automake 1.12.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -14,10 +14,6 @@ @SET_MAKE@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#13 $ -# - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -164,6 +160,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -195,6 +194,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -233,6 +234,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#50 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 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/auditd/auditd.c#49 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#50 $ */ #include <sys/types.h> @@ -36,9 +36,9 @@ #include <sys/dirent.h> #ifdef HAVE_FULL_QUEUE_H #include <sys/queue.h> -#else /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_FULL_QUEUE_H */ #include <compat/queue.h> -#endif /* !HAVE_FULL_QUEUE_H */ +#endif /* !HAVE_FULL_QUEUE_H */ #include <sys/mman.h> #include <sys/param.h> #include <sys/stat.h> @@ -82,18 +82,18 @@ * LaunchD flag (Mac OS X and, maybe, FreeBSD only.) See launchd(8) and * http://wiki.freebsd.org/launchd for more information. * - * In order for auditd to work "on demand" with launchd(8) it can't: - * call daemon(3) - * call fork and having the parent process exit - * change uids or gids. - * set up the current working directory or chroot. - * set the session id - * change stdio to /dev/null. - * call setrusage(2) - * call setpriority(2) - * Ignore SIGTERM. - * auditd (in 'launchd mode') is launched on demand so it must catch - * SIGTERM to exit cleanly. + * In order for auditd to work "on demand" with launchd(8) it can't: + * call daemon(3) + * call fork and having the parent process exit + * change uids or gids. + * set up the current working directory or chroot. + * set the session id + * change stdio to /dev/null. + * call setrusage(2) + * call setpriority(2) + * Ignore SIGTERM. + * auditd (in 'launchd mode') is launched on demand so it must catch + * SIGTERM to exit cleanly. */ static int launchd_flag = 0; @@ -168,7 +168,7 @@ /* Rename the last file -- append timestamp. */ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { memcpy(ptr, TS, POSTFIX_LEN); - if (rename(oldname, lastfile) != 0) + if (auditd_rename(oldname, lastfile) != 0) auditd_log_err( "Could not rename %s to %s: %m", oldname, lastfile); @@ -199,12 +199,35 @@ swap_audit_file(void) { int err; - char *newfile; - char TS[TIMESTAMP_LEN]; + char *newfile, *name; + char TS[TIMESTAMP_LEN + 1]; time_t tt; - if (getTSstr(tt, TS, TIMESTAMP_LEN) != 0) + if (getTSstr(tt, TS, sizeof(TS)) != 0) return (-1); + /* + * If prefix and suffix are the same, it means that records are + * being produced too fast. We don't want to rename now, because + * next trail file can get the same name and once that one is + * terminated also within one second it will overwrite the current + * one. Just keep writing to the same trail and wait for the next + * trigger from the kernel. + * FREEBSD KERNEL WAS UPDATED TO KEEP SENDING TRIGGERS, WHICH MIGHT + * NOT BE THE CASE FOR OTHER OSES. + * If the kernel will not keep sending triggers, trail file will not + * be terminated. + */ + if (lastfile == NULL) { + name = NULL; + } else { + name = strrchr(lastfile, '/'); + if (name != NULL) + name++; + } + if (name != NULL && strncmp(name, TS, TIMESTAMP_LEN) == 0) { + auditd_log_debug("Not ready to terminate trail file yet."); + return (0); + } err = auditd_swap_trail(TS, &newfile, audit_review_gid, audit_warn_getacdir); if (err != ADE_NOERR) { @@ -232,7 +255,7 @@ */ if (auditd_new_curlink(newfile) != 0) auditd_log_err("auditd_new_curlink(\"%s\") failed: %s: %m", - newfile, auditd_strerror(err)); + newfile, auditd_strerror(err)); lastfile = newfile; auditd_log_notice("New audit file is %s", newfile); @@ -295,6 +318,14 @@ { int err; + /* Configure trail files distribution. */ + err = auditd_set_dist(); + if (err) { + auditd_log_err("auditd_set_dist() %s: %m", + auditd_strerror(err)); + } else + auditd_log_debug("Configured trail files distribution."); + if (do_trail_file() == -1) { auditd_log_err("Error creating audit trail file"); fail_exit(); @@ -341,7 +372,7 @@ close_all(void) { int err_ret = 0; - char TS[TIMESTAMP_LEN]; + char TS[TIMESTAMP_LEN + 1]; int err; int cond; time_t tt; @@ -364,7 +395,7 @@ */ auditd_set_state(AUD_STATE_DISABLED); - if (getTSstr(tt, TS, TIMESTAMP_LEN) == 0) + if (getTSstr(tt, TS, sizeof(TS)) == 0) close_lastfile(TS); if (lastfile != NULL) free(lastfile); ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#3 $ -# +## +## $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.am#4 $ +## if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. +# Makefile.in generated by automake 1.12.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -14,10 +14,6 @@ @SET_MAKE@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#10 $ -# - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -157,6 +153,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -188,6 +187,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -226,6 +227,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#3 $ -# +## +## $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#4 $ +## if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. +# Makefile.in generated by automake 1.12.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -14,10 +14,6 @@ @SET_MAKE@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#12 $ -# - VPATH = @srcdir@ am__make_dryrun = \ { \ @@ -156,6 +152,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -187,6 +186,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -225,6 +226,7 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# -# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#3 $ -# +## +## $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#4 $ +## if USE_NATIVE_INCLUDES INCLUDES = -I$(top_builddir) -I$(top_srcdir) ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.1 from Makefile.am. >>> TRUNCATED FOR MAIL (1000 lines) <<<help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211181950.qAIJoHam031886>