diff options
Diffstat (limited to 'net/isc-dhcp3-server/files/patch-dhclient.c')
| -rw-r--r-- | net/isc-dhcp3-server/files/patch-dhclient.c | 52 |
1 files changed, 44 insertions, 8 deletions
diff --git a/net/isc-dhcp3-server/files/patch-dhclient.c b/net/isc-dhcp3-server/files/patch-dhclient.c index bb43074fbd36..ebbd815ecc5e 100644 --- a/net/isc-dhcp3-server/files/patch-dhclient.c +++ b/net/isc-dhcp3-server/files/patch-dhclient.c @@ -1,5 +1,5 @@ ---- client/dhclient.c.orig Thu Sep 14 05:42:01 2000 -+++ client/dhclient.c Wed Sep 27 03:31:33 2000 +--- client/dhclient.c.orig Thu Jan 25 09:18:06 2001 ++++ client/dhclient.c Fri Jan 26 06:15:50 2001 @@ -78,6 +78,7 @@ u_int16_t remote_port; int no_daemon; @@ -8,7 +8,27 @@ static void usage PROTO ((void)); -@@ -176,6 +177,8 @@ +@@ -104,6 +105,7 @@ + int no_dhclient_conf = 0; + int no_dhclient_db = 0; + int no_dhclient_pid = 0; ++ int no_dhclient_script = 0; + char *s; + + #ifdef SYSLOG_4_2 +@@ -159,6 +161,11 @@ + usage (); + path_dhclient_db = argv [i]; + no_dhclient_db = 1; ++ } else if (!strcmp (argv [i], "-sf")) { ++ if (++i == argc) ++ usage (); ++ client_script_name = argv [i]; ++ no_dhclient_script = 1; + } else if (!strcmp (argv [i], "-q")) { + quiet = 1; + quiet_interface_discovery = 1; +@@ -176,6 +183,8 @@ } else if (!strcmp (argv [i], "-w")) { /* do not exit if there are no broadcast interfaces. */ persist = 1; @@ -17,16 +37,32 @@ } else if (argv [i][0] == '-') { usage (); } else { -@@ -417,7 +420,7 @@ +@@ -208,6 +217,9 @@ + if (!no_dhclient_pid && (s = getenv ("PATH_DHCLIENT_PID"))) { + path_dhclient_pid = s; + } ++ if (!no_dhclient_script && (s = getenv ("PATH_DHCLIENT_SCRIPT"))) { ++ client_script_name = s; ++ } + + /* first kill of any currently running client */ + if (release_mode) { +@@ -423,10 +435,11 @@ log_info (arr); log_info (url); - log_error ("Usage: dhclient [-d] [-D] [-q] [-p <port>] %s", -+ log_error ("Usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s", ++ log_error ("usage: dhclient [-1] [-d] [-D] [-q] [-p <port>] %s", "[-s server]"); - log_fatal (" [-lf lease-file] [-pf pid-file]%s", - "[-cf config-file] [interface]"); -@@ -1402,6 +1405,10 @@ +- log_fatal (" [-lf lease-file] [-pf pid-file]%s", +- "[-cf config-file] [interface]"); ++ log_error (" [-cf config-file] [-lf lease-file] %s", ++ "[-pf pid-file] [-sf script-file]"); ++ log_fatal (" [interface]"); + } + + isc_result_t find_class (struct class **c, +@@ -1432,6 +1445,10 @@ /* No leases were available, or what was available didn't work, so tell the shell script that we failed to allocate an address, and try again later. */ |