Page MenuHomeFreeBSD
Files F140488886

D16783.diff
No OneTemporary
Actions

D16783.diff
View Options

Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -38,7 +38,6 @@
remote \
rpc \
services \
- syslog.conf \
termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
@@ -154,7 +153,6 @@
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
- ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
.if ${MK_UNBOUND} != "no"
Index: head/etc/syslog.conf
===================================================================
--- head/etc/syslog.conf
+++ head/etc/syslog.conf
@@ -1,34 +0,0 @@
-# $FreeBSD$
-#
-# Spaces ARE valid field separators in this file. However,
-# other *nix-like systems still insist on using tabs as field
-# separators. If you are sharing this file between systems, you
-# may want to use only tabs as field separators here.
-# Consult the syslog.conf(5) manpage.
-*.err;kern.warning;auth.notice;mail.crit /dev/console
-*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages
-security.* /var/log/security
-auth.info;authpriv.info /var/log/auth.log
-mail.info /var/log/maillog
-cron.* /var/log/cron
-!-devd
-*.=debug /var/log/debug.log
-*.emerg *
-# uncomment this to log all writes to /dev/console to /var/log/console.log
-# touch /var/log/console.log and chmod it to mode 600 before it will work
-#console.info /var/log/console.log
-# uncomment this to enable logging of all log messages to /var/log/all.log
-# touch /var/log/all.log and chmod it to mode 600 before it will work
-#*.* /var/log/all.log
-# uncomment this to enable logging to a remote loghost named loghost
-#*.* @loghost
-# uncomment these if you're running inn
-# news.crit /var/log/news/news.crit
-# news.err /var/log/news/news.err
-# news.notice /var/log/news/news.notice
-# Uncomment this if you wish to see messages produced by devd
-# !devd
-# *.>=notice /var/log/devd.log
-!*
-include /etc/syslog.d
-include /usr/local/etc/syslog.d
Index: head/etc/syslog.d/Makefile
===================================================================
--- head/etc/syslog.d/Makefile
+++ head/etc/syslog.d/Makefile
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-.if ${MK_FTP} != "no"
-FILES+= ftp.conf
-.endif
-
-.if ${MK_LPR} != "no"
-FILES+= lpr.conf
-.endif
-
-.if ${MK_PPP} != "no"
-FILES+= ppp.conf
-.endif
-
-BINDIR= /etc/syslog.d
-
-.include <bsd.prog.mk>
Index: head/etc/syslog.d/ftp.conf
===================================================================
--- head/etc/syslog.d/ftp.conf
+++ head/etc/syslog.d/ftp.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-ftp.info /var/log/xferlog
Index: head/etc/syslog.d/lpr.conf
===================================================================
--- head/etc/syslog.d/lpr.conf
+++ head/etc/syslog.d/lpr.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-lpr.info /var/log/lpd-errs
Index: head/etc/syslog.d/ppp.conf
===================================================================
--- head/etc/syslog.d/ppp.conf
+++ head/etc/syslog.d/ppp.conf
@@ -1,3 +0,0 @@
-# $FreeBSD$
-!ppp
-*.* /var/log/ppp.log
Index: head/usr.sbin/syslogd/Makefile
===================================================================
--- head/usr.sbin/syslogd/Makefile
+++ head/usr.sbin/syslogd/Makefile
@@ -5,6 +5,8 @@
.PATH: ${SRCTOP}/usr.bin/wall
+CONFGROUPS= CONFS SYSLOGD_D
+CONFS= syslog.conf
PROG= syslogd
MAN= syslog.conf.5 syslogd.8
SRCS= syslogd.c ttymsg.c
@@ -16,6 +18,20 @@
.endif
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
+.endif
+
+SYSLOGD_D=
+SYSLOGD_DDIR= /etc/syslog.d/
+.if ${MK_FTP} != "no"
+SYSLOGD_D+= ftp.conf
+.endif
+
+.if ${MK_LPR} != "no"
+SYSLOGD_D+= lpr.conf
+.endif
+
+.if ${MK_PPP} != "no"
+SYSLOGD_D+= ppp.conf
.endif
CFLAGS+= -I${SRCTOP}/usr.bin/wall
Index: head/usr.sbin/syslogd/ftp.conf
===================================================================
--- head/usr.sbin/syslogd/ftp.conf
+++ head/usr.sbin/syslogd/ftp.conf
@@ -0,0 +1,2 @@
+# $FreeBSD$
+ftp.info /var/log/xferlog
Index: head/usr.sbin/syslogd/lpr.conf
===================================================================
--- head/usr.sbin/syslogd/lpr.conf
+++ head/usr.sbin/syslogd/lpr.conf
@@ -0,0 +1,2 @@
+# $FreeBSD$
+lpr.info /var/log/lpd-errs
Index: head/usr.sbin/syslogd/ppp.conf
===================================================================
--- head/usr.sbin/syslogd/ppp.conf
+++ head/usr.sbin/syslogd/ppp.conf
@@ -0,0 +1,3 @@
+# $FreeBSD$
+!ppp
+*.* /var/log/ppp.log
Index: head/usr.sbin/syslogd/syslog.conf
===================================================================
--- head/usr.sbin/syslogd/syslog.conf
+++ head/usr.sbin/syslogd/syslog.conf
@@ -0,0 +1,34 @@
+# $FreeBSD$
+#
+# Spaces ARE valid field separators in this file. However,
+# other *nix-like systems still insist on using tabs as field
+# separators. If you are sharing this file between systems, you
+# may want to use only tabs as field separators here.
+# Consult the syslog.conf(5) manpage.
+*.err;kern.warning;auth.notice;mail.crit /dev/console
+*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages
+security.* /var/log/security
+auth.info;authpriv.info /var/log/auth.log
+mail.info /var/log/maillog
+cron.* /var/log/cron
+!-devd
+*.=debug /var/log/debug.log
+*.emerg *
+# uncomment this to log all writes to /dev/console to /var/log/console.log
+# touch /var/log/console.log and chmod it to mode 600 before it will work
+#console.info /var/log/console.log
+# uncomment this to enable logging of all log messages to /var/log/all.log
+# touch /var/log/all.log and chmod it to mode 600 before it will work
+#*.* /var/log/all.log
+# uncomment this to enable logging to a remote loghost named loghost
+#*.* @loghost
+# uncomment these if you're running inn
+# news.crit /var/log/news/news.crit
+# news.err /var/log/news/news.err
+# news.notice /var/log/news/news.notice
+# Uncomment this if you wish to see messages produced by devd
+# !devd
+# *.>=notice /var/log/devd.log
+!*
+include /etc/syslog.d
+include /usr/local/etc/syslog.d

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 25, 1:46 PM (9 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27248473
Default Alt Text
D16783.diff (6 KB)

Event Timeline