aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/Makefile14
-rw-r--r--usr.sbin/auditd/Makefile12
2 files changed, 12 insertions, 14 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 6d37ff73013b..53ff1305a70e 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -56,14 +56,6 @@ BIN1+= etc.${MACHINE_CPUARCH}/ttys
.error etc.MACHINE/ttys missing
.endif
-OPENBSMDIR= ${SRCTOP}/contrib/openbsm
-BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \
- ${OPENBSMDIR}/etc/audit_event
-BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \
- ${OPENBSMDIR}/etc/audit_user
-BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn
-BSM_ETC_DIR= ${DESTDIR}/etc/security
-
# NB: keep these sorted by MK_* knobs
.if ${MK_AMD} != "no"
@@ -203,12 +195,6 @@ distribution:
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
- ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \
- ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
- ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
.if ${MK_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
diff --git a/usr.sbin/auditd/Makefile b/usr.sbin/auditd/Makefile
index 45fcd7591572..5385463a6e3b 100644
--- a/usr.sbin/auditd/Makefile
+++ b/usr.sbin/auditd/Makefile
@@ -7,6 +7,18 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm
CFLAGS+= -I${OPENBSMDIR}
+OPENBSMETCDIR= ${OPENBSMDIR}/etc
+CONFS= ${OPENBSMETCDIR}/audit_class
+CONFSMODE_${OPENBSMETCDIR}/audit_class= 444
+CONFS+= ${OPENBSMETCDIR}/audit_control
+CONFSMODE_${OPENBSMETCDIR}/audit_control= 600
+CONFS+= ${OPENBSMETCDIR}/audit_event
+CONFSMODE_${OPENBSMETCDIR}/audit_event= 444
+CONFS+= ${OPENBSMETCDIR}/audit_user
+CONFSMODE_${OPENBSMETCDIR}/audit_user= 600
+CONFS+= ${OPENBSMETCDIR}/audit_warn
+CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500
+CONFSDIR= /etc/security
PROG= auditd
SRCS= auditd.c audit_warn.c auditd_fbsd.c
MAN= auditd.8