From c788d4f8d4e8cea9913d46ee0a24c67f3cd78e98 Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Thu, 18 May 2017 22:00:51 +0200 Subject: [19430] dhclient now calls script with reason=FAIL even with -1 option --- RELNOTES | 5 +++++ client/dhclient.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/RELNOTES b/RELNOTES index b5817c4b..bed0403b 100644 --- a/RELNOTES +++ b/RELNOTES @@ -54,6 +54,11 @@ by Eric Young (eay@cryptsoft.com). Changes since 4.3.0 (new features) +- Client now calls the script with reason set to FAIL when run with -1 (ony try) + and there are no sever responses. Thank you Andrew Pollock for providing + an initial patch. + [ISC-bugs #18183] + - Insert the raw data from a fully encapsualted option into the option cache. This allows "exists" to check for the option if any sub options exist. It also adds the raw data to the environment variables supplied to the client diff --git a/client/dhclient.c b/client/dhclient.c index ad3c899b..1f07d20c 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -1471,6 +1471,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); @@ -2480,6 +2485,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); } -- cgit v1.2.1 From a489cc48c372cf6158518178a629c9d1dff7d1ec Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Wed, 21 Jun 2017 19:24:02 +0200 Subject: [rt18183] Spelling corrected. --- RELNOTES | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RELNOTES b/RELNOTES index bed0403b..bc90243f 100644 --- a/RELNOTES +++ b/RELNOTES @@ -54,11 +54,6 @@ by Eric Young (eay@cryptsoft.com). Changes since 4.3.0 (new features) -- Client now calls the script with reason set to FAIL when run with -1 (ony try) - and there are no sever responses. Thank you Andrew Pollock for providing - an initial patch. - [ISC-bugs #18183] - - Insert the raw data from a fully encapsualted option into the option cache. This allows "exists" to check for the option if any sub options exist. It also adds the raw data to the environment variables supplied to the client @@ -134,6 +129,11 @@ by Eric Young (eay@cryptsoft.com). includes/site.h. This flag is undefined by default. [ISC-Bugs #43927] +- Client now calls the script with reason set to FAIL when run with -1 (one try) + and there are no sever responses. Thank you Andrew Pollock for providing + an initial patch. + [ISC-bugs #18183] + Changes since 4.3.0 (bug fixes) - Tidy up several small tickets. -- cgit v1.2.1 From e11ab664661d9ce0ea8c347360b406db71910ef5 Mon Sep 17 00:00:00 2001 From: tmarkwalder Date: Thu, 22 Jun 2017 07:24:29 -0400 Subject: [18183] Fixed typo in release notes --- RELNOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index bc90243f..0b7072df 100644 --- a/RELNOTES +++ b/RELNOTES @@ -130,7 +130,7 @@ by Eric Young (eay@cryptsoft.com). [ISC-Bugs #43927] - Client now calls the script with reason set to FAIL when run with -1 (one try) - and there are no sever responses. Thank you Andrew Pollock for providing + and there are no server responses. Thank you Andrew Pollock for providing an initial patch. [ISC-bugs #18183] -- cgit v1.2.1 From d43a58357306ead91a2a0a8689b514667704f5db Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Thu, 22 Jun 2017 15:35:34 +0200 Subject: [18183] RELNOTES acknowledgment updated --- RELNOTES | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RELNOTES b/RELNOTES index 0b7072df..dbc4d250 100644 --- a/RELNOTES +++ b/RELNOTES @@ -129,9 +129,9 @@ by Eric Young (eay@cryptsoft.com). includes/site.h. This flag is undefined by default. [ISC-Bugs #43927] -- Client now calls the script with reason set to FAIL when run with -1 (one try) - and there are no server responses. Thank you Andrew Pollock for providing - an initial patch. +- 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) -- cgit v1.2.1