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 /client/dhclient.c | |
| parent | d1d1da8fff09cea21ad2a7c22412e199542e83d2 (diff) | |
| download | isc-dhcp-bf673d217b4abe6a84b68859686d50034fcbe486.tar.gz | |
Unmerged #38692
Diffstat (limited to 'client/dhclient.c')
| -rw-r--r-- | client/dhclient.c | 16 |
1 files changed, 3 insertions, 13 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) |