[master] Merge branch 'rt18183' (script call with fail reason and -1)

# Conflicts:
#	RELNOTES

diff --cc RELNOTES
index ac08bcedfc5a0b5177173c2210cc205f1ee6b755,dbc4d250062fc674f1810e9de09601f6d15d733b..07b35ee442e2e9179312431114c3ab3d0b3b4d03
--- 1/RELNOTES
--- 2/RELNOTES
+++ b/RELNOTES
@@@ -129,40 -129,11 +129,45 @@@ by Eric Young (eay@cryptsoft.com)
    includes/site.h. This flag is undefined by default.
    [ISC-Bugs #43927]
  
 +- Added new compile time option --with-srv-conf-file which specifies a
 +  default location of the server configuration file.
 +  [ISC-Bugs #44765]
 +
 +- Added --dad-wait-time parameter to dhclient. It specifies the maximum time,
 +  in seconds, that the client process should wait for the duplicate address
 +  detection to complete before initiating DHCP requests. This value is
 +  propagated to the dhclient script and the script is responsible for waiting
 +  the specified amount of time or until DAD has completed. If the script does
 +  not support it, specifying this parameter has no effect. The default value
 +  is 0 which specifies that the script should not wait for DAD. With this
 +  change the following scripts have been modified to support the new parameter:
 +  freebsd, linux, macos, netbsd, openbsd.
 +  [ISC-Bugs #36169]
 +
 +- Modified DDNS support initialization such that DNS related ports will only be
 +  opened by the server (dhcpd) at startup if ddns-update-style is not "none";
 +  by dhclient only if and when the it first attempts an update; and never by
 +  dhcrelay.  Prior to this all three always did the initialization at startup
 +  which causes them to always open on and listen for traffic on two random
 +  ports. Thanks to Rodney Beede for reporting the issue.
 +  [ISC-Bugs #45290]
 +  [ISC-Bugs #33377]
 +
 +- Added error logging to two memory allocation failure checks. Thanks to Bill
 +  Parker (wp02855 at gmail dot com) for reporting the issue.
 +  [ISC-Bugs #41185]
 +
 +- Corrected a dhclient -6 issue that caused the client to crash with an
 +  "Impossible condition" error after de-preferencing its only IA binding.
 +  The crash occurred when server configuration changes rendered the existing
 +  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 --cc client/dhclient.c
Simple merge