diff options
| author | Tomek Mrugalski <tomasz@isc.org> | 2017-06-22 15:37:17 +0200 |
|---|---|---|
| committer | Tomek Mrugalski <tomasz@isc.org> | 2017-06-22 15:37:17 +0200 |
| commit | 3f2eb206639e5e08b8a07e2c6cad479445bc1654 (patch) | |
| tree | 0a4d10dffed71f67bec449a41b2287d86070cc3c | |
| parent | ff343a30c46c78902766787f50d811dd6ced64e4 (diff) | |
| parent | d43a58357306ead91a2a0a8689b514667704f5db (diff) | |
| download | isc-dhcp-3f2eb206639e5e08b8a07e2c6cad479445bc1654.tar.gz | |
[master] Merge branch 'rt18183' (script call with fail reason and -1)
# Conflicts:
# RELNOTES
| -rw-r--r-- | RELNOTES | 5 | ||||
| -rw-r--r-- | client/dhclient.c | 10 |
2 files changed, 15 insertions, 0 deletions
@@ -163,6 +163,11 @@ by Eric Young (eay@cryptsoft.com). binding out-of-range and no other leases were available to offer. [ISC-Bugs #44373] +- Client now calls the script with reason set to FAIL when run with -1 + (one try) and there are no server responses. Thanks for a patch by Martin + Pitt which got to us via Andrew Pollock. + [ISC-bugs #18183] + Changes since 4.3.0 (bug fixes) - Tidy up several small tickets. diff --git a/client/dhclient.c b/client/dhclient.c index 56586f2b..98422f02 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -1482,6 +1482,11 @@ void bind_lease (client) if (!quiet) log_info("Unable to obtain a lease on first " "try (declined). Exiting."); + + /* Let's call a script and we're done */ + script_init(client, "FAIL", (struct string_list *)0); + script_go(client); + finish(2); } else { state_init(client); @@ -2491,6 +2496,11 @@ void state_panic (cpp) if (!quiet) log_info ("Unable to obtain a lease on first try.%s", " Exiting."); + + /* Let's call a script and we're done */ + script_init(client, "FAIL", (struct string_list *)0); + script_go(client); + finish(2); } |