PERFORCE change 219839 for review
Robert Watson
rwatson at FreeBSD.org
Fri Nov 23 23:40:07 UTC 2012
http://p4web.freebsd.org/@@219839?ac=10
Change 219839 by rwatson at rwatson_cinnamon on 2012/11/23 23:39:14
Merge build glue, master.passwd entry, rc.conf, rc.d, etc for
OpenBSM 1.2-alpha2 to FreeBSD -CURRENT merge branch. This
doesn't yet build due to clang being a bit pickier than gcc
for aspects of auditdistd.
Submitted by: pjd (with tweaks)
Affected files ...
.. //depot/projects/trustedbsd/audit_merge/src/etc/defaults/rc.conf#2 edit
.. //depot/projects/trustedbsd/audit_merge/src/etc/ftpusers#2 edit
.. //depot/projects/trustedbsd/audit_merge/src/etc/mail/aliases#2 edit
.. //depot/projects/trustedbsd/audit_merge/src/etc/master.passwd#2 edit
.. //depot/projects/trustedbsd/audit_merge/src/etc/mtree/BSD.var.dist#2 edit
.. //depot/projects/trustedbsd/audit_merge/src/etc/rc.d/Makefile#2 edit
.. //depot/projects/trustedbsd/audit_merge/src/etc/rc.d/auditdistd#1 add
.. //depot/projects/trustedbsd/audit_merge/src/share/man/man4/audit.4#2 edit
.. //depot/projects/trustedbsd/audit_merge/src/usr.sbin/Makefile#2 edit
Differences ...
==== //depot/projects/trustedbsd/audit_merge/src/etc/defaults/rc.conf#2 (text+ko) ====
@@ -590,6 +590,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)
==== //depot/projects/trustedbsd/audit_merge/src/etc/ftpusers#2 (text+ko) ====
@@ -19,6 +19,7 @@
_dhcp
uucp
pop
+auditdistd
www
hast
nobody
==== //depot/projects/trustedbsd/audit_merge/src/etc/mail/aliases#2 (text+ko) ====
@@ -26,6 +26,7 @@
# General redirections for pseudo accounts
_dhcp: root
_pflogd: root
+auditdistd: root
bin: root
bind: root
daemon: root
==== //depot/projects/trustedbsd/audit_merge/src/etc/master.passwd#2 (text+ko) ====
@@ -20,6 +20,7 @@
_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
+auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
==== //depot/projects/trustedbsd/audit_merge/src/etc/mtree/BSD.var.dist#2 (text+ko) ====
@@ -19,6 +19,10 @@
/set gname=audit
audit
..
+ dist uname=auditdistd gname=audit mode=0770
+ ..
+ remote uname=auditdistd gname=wheel mode=0700
+ ..
/set gname=wheel
backups
..
==== //depot/projects/trustedbsd/audit_merge/src/etc/rc.d/Makefile#2 (text+ko) ====
@@ -19,6 +19,7 @@
atm2 \
atm3 \
auditd \
+ auditdistd \
bgfsck \
bluetooth \
bootparams \
==== //depot/projects/trustedbsd/audit_merge/src/share/man/man4/audit.4#2 (text+ko) ====
@@ -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
==== //depot/projects/trustedbsd/audit_merge/src/usr.sbin/Makefile#2 (text+ko) ====
@@ -110,6 +110,9 @@
.if ${MK_AUDIT} != "no"
SUBDIR+= audit
SUBDIR+= auditd
+.if ${MK_OPENSSL} != "no"
+SUBDIR+= auditdistd
+.endif
SUBDIR+= auditreduce
SUBDIR+= praudit
.endif
More information about the p4-projects
mailing list