diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-01-20 07:03:22 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-01-20 07:03:22 +0000 |
| commit | 44c613fec47db3235c6d35f1a7cf10fbfc5e0ff9 (patch) | |
| tree | e29f8b52215ff6da9e3ff66867f4b0b61dfdbf71 | |
| parent | 4a05e76171b450a8c94168d62781fde3f653e48f (diff) | |
We all have syslog() now; assume LOG_PID and LOG_DAEMON
| -rw-r--r-- | usr.bin/rdist/config.h | 14 | ||||
| -rw-r--r-- | usr.bin/rdist/message.c | 10 |
2 files changed, 3 insertions, 21 deletions
diff --git a/usr.bin/rdist/config.h b/usr.bin/rdist/config.h index 71a094bf23c..7974c53522e 100644 --- a/usr.bin/rdist/config.h +++ b/usr.bin/rdist/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.11 2015/01/20 03:55:18 guenther Exp $ */ +/* $OpenBSD: config.h,v 1.12 2015/01/20 07:03:21 guenther Exp $ */ /* * Copyright (c) 1993 Michael A. Cooper @@ -72,18 +72,6 @@ #define RTIMEOUT 900 /* - * Define LOG_OPTS to be the syslog/openlog() logging options you - * wish to use. Define to be 0 if you don't want any options. - * Define LOG_FACILITY to be the syslog/openlog() facility to log - * to. Both LOG_OPTS and LOG_FACILITY values are defined in <syslog.h> - * If you don't have syslog, then undefine both values. - */ -#define LOG_OPTS LOG_PID -#if defined(LOG_DAEMON) -# define LOG_FACILITY LOG_DAEMON -#endif - -/* * Syslog levels. Define these to match the levels you want to log * via syslog(). These are defined in <syslog.h>. If you don't want * a particuliar level logged _ever_, undefine it. What is logged is diff --git a/usr.bin/rdist/message.c b/usr.bin/rdist/message.c index 72933cf2e4a..9c4271469e1 100644 --- a/usr.bin/rdist/message.c +++ b/usr.bin/rdist/message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: message.c,v 1.25 2015/01/20 06:08:08 guenther Exp $ */ +/* $OpenBSD: message.c,v 1.26 2015/01/20 07:03:21 guenther Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -242,13 +242,7 @@ setmsgtypes(struct msgfacility *msgfac, char *str) break; case MF_SYSLOG: -#if defined(LOG_OPTS) -#if defined(LOG_FACILITY) - openlog(progname, LOG_OPTS, LOG_FACILITY); -#else - openlog(progname, LOG_OPTS); -#endif /* LOG_FACILITY */ -#endif /* LOG_OPTS */ + openlog(progname, LOG_PID, LOG_DAEMON); break; } |