From 6912f1d595437674f661f0b702b2400b3adea751 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Tue, 20 Jan 2015 07:03:21 +0000
Subject: [PATCH] We all have syslog() now; assume LOG_PID and LOG_DAEMON

---
 usr.bin/rdist/config.h  | 14 +-------------
 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
@@ -71,18 +71,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
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;
 	}
 
-- 
2.20.1