diff options
author | Francis Dupont <fdupont@isc.org> | 2015-11-17 16:36:19 +0100 |
---|---|---|
committer | Francis Dupont <fdupont@isc.org> | 2015-11-17 16:36:19 +0100 |
commit | bf673d217b4abe6a84b68859686d50034fcbe486 (patch) | |
tree | 8b4a1e227c2a64212ae4965b3880ee1a6eaa5198 | |
parent | d1d1da8fff09cea21ad2a7c22412e199542e83d2 (diff) | |
download | isc-dhcp-bf673d217b4abe6a84b68859686d50034fcbe486.tar.gz |
Unmerged #38692
-rw-r--r-- | client/dhclient.c | 16 | ||||
-rw-r--r-- | dhcpctl/omshell.c | 17 | ||||
-rw-r--r-- | includes/omapip/omapip_p.h | 3 | ||||
-rw-r--r-- | includes/site.h | 6 | ||||
-rw-r--r-- | relay/dhcrelay.c | 29 | ||||
-rw-r--r-- | server/dhcpd.c | 20 |
6 files changed, 18 insertions, 73 deletions
diff --git a/client/dhclient.c b/client/dhclient.c index 3a0c0611..be2af6ad 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -37,7 +37,6 @@ #include <sys/time.h> #include <sys/wait.h> #include <limits.h> -#include <isc/file.h> #include <dns/result.h> TIME default_lease_time = 43200; /* 12 hours... */ @@ -90,8 +89,6 @@ int wanted_ia_ta = 0; int wanted_ia_pd = 0; char *mockup_relay = NULL; -char *progname = NULL; - void run_stateless(int exit_mode); static void usage(void); @@ -132,12 +129,6 @@ main(int argc, char **argv) { #endif /* DHCPv6 */ char *s; -#ifdef OLD_LOG_NAME - progname = "dhclient"; -#else - progname = argv[0]; -#endif - /* Initialize client globals. */ memset(&default_duid, 0, sizeof(default_duid)); @@ -154,7 +145,7 @@ main(int argc, char **argv) { else if (fd != -1) close(fd); - openlog(isc_file_basename(progname), DHCP_LOG_OPTIONS, LOG_DAEMON); + openlog("dhclient", DHCP_LOG_OPTIONS, LOG_DAEMON); #if !(defined(DEBUG) || defined(__CYGWIN32__)) setlogmask(LOG_UPTO(LOG_INFO)); @@ -759,7 +750,7 @@ static void usage() log_info(url); - log_fatal("Usage: %s " + log_fatal("Usage: dhclient " #ifdef DHCPv6 "[-4|-6] [-SNTPI1dvrxi] [-nw] [-p <port>] [-D LL|LLT] \n" #else /* DHCPv6 */ @@ -768,8 +759,7 @@ static void usage() " [-s server-addr] [-cf config-file]\n" " [-df duid-file] [-lf lease-file]\n" " [-pf pid-file] [--no-pid] [-e VAR=val]\n" - " [-sf script-file] [interface]", - isc_file_basename(progname)); + " [-sf script-file] [interface]"); } void run_stateless(int exit_mode) diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c index adf4b9ae..44fd2726 100644 --- a/dhcpctl/omshell.c +++ b/dhcpctl/omshell.c @@ -3,7 +3,7 @@ Examine and modify omapi objects. */ /* - * Copyright (c) 2009-2011,2013-2015 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2009-2011,2013,2014 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2001-2003 by Internet Software Consortium * @@ -39,7 +39,6 @@ #include <syslog.h> #include "dhcpctl.h" #include "dhcpd.h" -#include <isc/file.h> /* Fixups */ isc_result_t find_class (struct class **c, const char *n, const char *f, int l) @@ -64,7 +63,7 @@ int check_collection (struct packet *p, struct lease *l, struct collection *c) } void classify (struct packet *packet, struct class *class) { } -static void usage (const char *s) { +static void usage (char *s) { fprintf (stderr, "Usage: %s\n", s); exit (1); } @@ -95,21 +94,13 @@ main(int argc, char **argv) { char s1[1024]; int connected = 0; char hex_buf[1025]; - char *progname; - -#ifdef OLD_LOG_NAME - progname = "omshell"; -#else - progname = argv[0]; -#endif for (i = 1; i < argc; i++) { - usage(isc_file_basename(progname)); + usage(argv[0]); } /* Initially, log errors to stderr as well as to syslogd. */ - openlog (isc_file_basename(progname), - DHCP_LOG_OPTIONS, DHCPD_LOG_FACILITY); + openlog ("omshell", DHCP_LOG_OPTIONS, DHCPD_LOG_FACILITY); status = dhcpctl_initialize (); if (status != ISC_R_SUCCESS) { fprintf (stderr, "dhcpctl_initialize: %s\n", diff --git a/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h index 3370a93e..788c91e6 100644 --- a/includes/omapip/omapip_p.h +++ b/includes/omapip/omapip_p.h @@ -3,8 +3,7 @@ Private master include file for the OMAPI library. */ /* - * Copyright (c) 2014-2015 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2009-2010,2014 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * diff --git a/includes/site.h b/includes/site.h index ce7876ba..f11fefbf 100644 --- a/includes/site.h +++ b/includes/site.h @@ -190,12 +190,6 @@ /* #define USE_RAW_SOCKETS */ -/* Define this to keep the old program name (e.g., "dhcpd" for - the DHCP server) in place of the (base) name the program was - invoked with. */ - -/* #define OLD_LOG_NAME */ - /* Define this to change the logging facility used by dhcpd. */ /* #define DHCPD_LOG_FACILITY LOG_DAEMON */ diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 67933de1..15b49976 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -30,7 +30,6 @@ #include <syslog.h> #include <signal.h> #include <sys/time.h> -#include <isc/file.h> TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ @@ -141,17 +140,15 @@ static const char message[] = static const char url[] = "For info, please visit https://www.isc.org/software/dhcp/"; -char *progname; - #ifdef DHCPv6 #define DHCRELAY_USAGE \ -"Usage: %s [-4] [-d] [-q] [-a] [-D]\n"\ +"Usage: dhcrelay [-4] [-d] [-q] [-a] [-D]\n"\ " [-A <length>] [-c <hops>] [-p <port>]\n" \ " [-pf <pid-file>] [--no-pid]\n"\ " [-m append|replace|forward|discard]\n" \ " [-i interface0 [ ... -i interfaceN]\n" \ " server0 [ ... serverN]\n\n" \ -" %s -6 [-d] [-q] [-I] [-c <hops>] [-p <port>]\n" \ +" dhcrelay -6 [-d] [-q] [-I] [-c <hops>] [-p <port>]\n" \ " [-pf <pid-file>] [--no-pid]\n" \ " [-s <subscriber-id>]\n" \ " -l lower0 [ ... -l lowerN]\n" \ @@ -160,7 +157,7 @@ char *progname; " upper (server link): [address%%]interface" #else #define DHCRELAY_USAGE \ -"Usage: %s [-d] [-q] [-a] [-D] [-A <length>] [-c <hops>] [-p <port>]\n" \ +"Usage: dhcrelay [-d] [-q] [-a] [-D] [-A <length>] [-c <hops>] [-p <port>]\n" \ " [-pf <pid-file>] [--no-pid]\n" \ " [-m append|replace|forward|discard]\n" \ " [-i interface0 [ ... -i interfaceN]\n" \ @@ -168,11 +165,7 @@ char *progname; #endif static void usage() { - log_fatal(DHCRELAY_USAGE, -#ifdef DHCPv6 - isc_file_basename(progname), -#endif - isc_file_basename(progname)); + log_fatal(DHCRELAY_USAGE); } int @@ -191,12 +184,6 @@ main(int argc, char **argv) { int local_family_set = 0; #endif -#ifdef OLD_LOG_NAME - progname = "dhcrelay"; -#else - progname = argv[0]; -#endif - /* Make sure that file descriptors 0(stdin), 1,(stdout), and 2(stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ @@ -210,7 +197,7 @@ main(int argc, char **argv) { else if (fd != -1) close(fd); - openlog(isc_file_basename(progname), DHCP_LOG_OPTIONS, LOG_DAEMON); + openlog("dhcrelay", DHCP_LOG_OPTIONS, LOG_DAEMON); #if !defined(DEBUG) setlogmask(LOG_UPTO(LOG_INFO)); @@ -401,11 +388,7 @@ main(int argc, char **argv) { exit(0); } else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) { - log_info(DHCRELAY_USAGE, -#ifdef DHCPv6 - isc_file_basename(progname), -#endif - isc_file_basename(progname)); + log_info(DHCRELAY_USAGE); exit(0); } else if (argv[i][0] == '-') { usage(); diff --git a/server/dhcpd.c b/server/dhcpd.c index 792684d1..97233844 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -41,7 +41,6 @@ static const char url [] = #include <limits.h> #include <sys/types.h> #include <sys/time.h> -#include <isc/file.h> #if defined (PARANOIA) # include <sys/types.h> @@ -97,8 +96,6 @@ int omapi_port; trace_type_t *trace_srandom; #endif -char *progname; - static isc_result_t verify_addr (omapi_object_t *l, omapi_addr_t *addr) { return ISC_R_SUCCESS; } @@ -196,12 +193,6 @@ main(int argc, char **argv) { char *set_chroot = 0; #endif /* PARANOIA */ -#ifdef OLD_LOG_NAME - progname = "dhcpd"; -#else - progname = argv[0]; -#endif - /* Make sure that file descriptors 0 (stdin), 1, (stdout), and 2 (stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ @@ -238,8 +229,7 @@ main(int argc, char **argv) { dhcp_common_objects_setup (); /* Initially, log errors to stderr as well as to syslogd. */ - openlog (isc_file_basename(progname), - DHCP_LOG_OPTIONS, DHCPD_LOG_FACILITY); + openlog ("dhcpd", DHCP_LOG_OPTIONS, DHCPD_LOG_FACILITY); for (i = 1; i < argc; i++) { if (!strcmp (argv [i], "-p")) { @@ -1061,8 +1051,7 @@ void postconf_initialization (int quiet) &global_scope, oc, MDL)) { if (db.len == 1) { closelog (); - openlog(isc_file_basename(progname), - DHCP_LOG_OPTIONS, db.data[0]); + openlog("dhcpd", DHCP_LOG_OPTIONS, db.data[0]); /* Log the startup banner into the new log file. */ /* Don't log to stderr twice. */ @@ -1174,7 +1163,7 @@ usage(void) { log_info(copyright); log_info(arr); - log_fatal("Usage: %s [-p <UDP port #>] [-f] [-d] [-q] [-t|-T]\n" + log_fatal("Usage: dhcpd [-p <UDP port #>] [-f] [-d] [-q] [-t|-T]\n" #ifdef DHCPv6 " [-4|-6] [-cf config-file] [-lf lease-file]\n" #else /* !DHCPv6 */ @@ -1189,8 +1178,7 @@ usage(void) { " [-play trace-input-file]\n" #endif /* TRACING */ " [-pf pid-file] [--no-pid] [-s server]\n" - " [if0 [...ifN]]", - isc_file_basename(progname)); + " [if0 [...ifN]]"); } #endif |