From ec344e294ef28b965194b4e82031359ce68bc1cc Mon Sep 17 00:00:00 2001 From: krw Date: Fri, 23 May 2014 15:26:22 +0000 Subject: [PATCH] A #define to rename another #define which is then used only once introduces more obscurity than clarity. Nuke DHCPD_LOG_FACILITY and just use LOG_DAEMON in openlog() call. --- sbin/dhclient/dhclient.c | 4 ++-- sbin/dhclient/dhcpd.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 63123283641..8a04253e5b2 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.309 2014/05/19 10:42:08 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.310 2014/05/23 15:26:22 krw Exp $ */ /* * Copyright 2004 Henning Brauer @@ -401,7 +401,7 @@ main(int argc, char *argv[]) saved_argv = argv; /* Initially, log errors to stderr as well as to syslogd. */ - openlog(__progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY); + openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); setlogmask(LOG_UPTO(LOG_INFO)); while ((ch = getopt(argc, argv, "c:di:l:L:qu")) != -1) diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 435c3cebd65..1d9e79471cd 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.138 2014/04/30 15:11:00 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.139 2014/05/23 15:26:22 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer @@ -198,7 +198,6 @@ struct dhcp_timeout { #define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" #define _PATH_DHCLIENT_DB "/var/db/dhclient.leases" -#define DHCPD_LOG_FACILITY LOG_DAEMON /* External definitions. */ -- 2.20.1