[Midnightbsd-cvs] src [8511] trunk: fix location of auditdistd config file.

[laffer1 at midnightbsd.org]

Revision: 8511
          http://svnweb.midnightbsd.org/src/?rev=8511
Author:   laffer1
Date:     2016-09-18 18:53:07 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
fix location of auditdistd config file.

Modified Paths:
--------------
    trunk/Makefile
    trunk/etc/defaults/rc.conf
    trunk/etc/mtree/BSD.var.dist
    trunk/etc/rc.d/Makefile
    trunk/share/man/man4/audit.4
    trunk/usr.sbin/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2016-09-18 22:51:54 UTC (rev 8510)
+++ trunk/Makefile	2016-09-18 22:53:07 UTC (rev 8511)
@@ -1,4 +1,36 @@
 #
+# $FreeBSD$
+#
+
+OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+.PATH: ${OPENBSMDIR}/bin/auditdistd
+
+# Addition of auditdistd because otherwise generated parse.c can't find
+# auditdistd.h.  This seems like a makefile non-feature.
+CFLAGS+=-I${OPENBSMDIR} -I${OPENBSMDIR}/bin/auditdistd
+
+NO_WFORMAT=
+
+PROG=	auditdistd
+SRCS=	auditdistd.c
+SRCS+=	parse.y pjdlog.c
+SRCS+=	proto.c proto_common.c proto_socketpair.c proto_tcp.c proto_tls.c
+SRCS+=	receiver.c
+SRCS+=	sandbox.c sender.c subr.c
+SRCS+=	token.l trail.c
+MAN=	auditdistd.8 auditdistd.conf.5
+
+DPADD=	${LIBL} ${LIBPTHREAD} ${LIBUTIL}
+LDADD=	-ll -lpthread -lutil
+DPADD+=	${LIBCRYPTO} ${LIBSSL}
+LDADD+=	-lcrypto -lssl
+
+YFLAGS+=-v
+
+CLEANFILES=parse.c parse.h parse.output
+
+.include <bsd.prog.mk>
+#
 # $MidnightBSD$
 #
 # The user-driven targets are:

Modified: trunk/etc/defaults/rc.conf
===================================================================
--- trunk/etc/defaults/rc.conf	2016-09-18 22:51:54 UTC (rev 8510)
+++ trunk/etc/defaults/rc.conf	2016-09-18 22:53:07 UTC (rev 8511)
@@ -609,6 +609,9 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
+auditdistd_enable="NO"	# Run the audit daemon.
+auditdistd_program="/usr/sbin/auditdistd"	# Path to the auditdistd daemon.
+auditdistd_flags=""	# Which options to pass to the auditdistd daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)

Modified: trunk/etc/mtree/BSD.var.dist
===================================================================
--- trunk/etc/mtree/BSD.var.dist	2016-09-18 22:51:54 UTC (rev 8510)
+++ trunk/etc/mtree/BSD.var.dist	2016-09-18 22:53:07 UTC (rev 8511)
@@ -20,6 +20,10 @@
 /set gname=audit
     audit
     ..
+        dist            uname=auditdistd gname=audit mode=0770
+        ..
+        remote          uname=auditdistd gname=wheel mode=0700
+        ..
 /set gname=wheel
     backups
     ..

Modified: trunk/etc/rc.d/Makefile
===================================================================
--- trunk/etc/rc.d/Makefile	2016-09-18 22:51:54 UTC (rev 8510)
+++ trunk/etc/rc.d/Makefile	2016-09-18 22:53:07 UTC (rev 8511)
@@ -4,7 +4,7 @@
 
 FILES=	DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
-	apm apmd archdep atm1 atm2 atm3 auditd \
+	apm apmd archdep atm1 atm2 atm3 auditd auditdistd \
 	bgfsck bluetooth bootparams bridge bsnmpd bthidd \
 	ccd cleanvar cleartmp cron \
 	ddb defaultroute devd devfs dhclient dhcp6c \

Modified: trunk/share/man/man4/audit.4
===================================================================
--- trunk/share/man/man4/audit.4	2016-09-18 22:51:54 UTC (rev 8510)
+++ trunk/share/man/man4/audit.4	2016-09-18 22:53:07 UTC (rev 8511)
@@ -96,7 +96,8 @@
 .Xr audit_warn 5 ,
 .Xr rc.conf 5 ,
 .Xr audit 8 ,
-.Xr auditd 8
+.Xr auditd 8 ,
+.Xr auditdistd 8
 .Sh HISTORY
 The
 .Tn OpenBSM

Modified: trunk/usr.sbin/Makefile
===================================================================
--- trunk/usr.sbin/Makefile	2016-09-18 22:51:54 UTC (rev 8510)
+++ trunk/usr.sbin/Makefile	2016-09-18 22:53:07 UTC (rev 8511)
@@ -115,6 +115,9 @@
 .if ${MK_AUDIT} != "no"
 SUBDIR+=	audit
 SUBDIR+=	auditd
+.if ${MK_OPENSSL} != "no"
+SUBDIR+=	auditdistd
+.endif
 SUBDIR+=	auditreduce
 SUBDIR+=	praudit
 .endif