[master] Added include of isc/util.h as needed

    Merges in 46332.

diff --git a/RELNOTES b/RELNOTES
index d3019ddb4cb1bafe23d78b98ddd7978a1c2a7e6e..bd1a14a4f0db48eb1a27cb79279ef575634dd4ac 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1138,6 +1138,11 @@ dhcp-users@lists.isc.org.
   for pointing out the error of our ways.
   [ISC-bugs #45780]
 
+- Added explicit include of BIND9 isc/util.h to adapt to revisisions
+  in BIND9 (see BIND9 ticket #46311).  Prior to this the build was failing
+  with implicit function declarations errors for POST() and INSIST().
+  [ISC-bugs #46332]
+
                        Changes since 4.2.0 (new features)
 
 - If a client renews before 'dhcp-cache-threshold' percent of its lease

diff --git a/client/dhclient.c b/client/dhclient.c
index 56511df47cd40e23ac0faac2cdeb93ddaa7d2dbc..081783b449f617e9dd320ed755f03843f7d23de3 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -31,14 +31,15 @@
  */
 
 #include "dhcpd.h"
+#include <isc/util.h>
+#include <isc/file.h>
+#include <dns/result.h>
 #include <syslog.h>
 #include <signal.h>
 #include <errno.h>
 #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... */
 TIME max_lease_time = 86400; /* 24 hours... */

diff --git a/common/execute.c b/common/execute.c
index 6a756172cc87c48248feaa69be0a120bb29c9f46..a33cec85d6090a25ea3ef5a98499f7a6cafbb124 100644 (file)
--- a/common/execute.c
+++ b/common/execute.c
@@ -27,6 +27,7 @@
  */
 
 #include "dhcpd.h"
+#include <isc/util.h>
 #include <omapip/omapip_p.h>
 #include <sys/types.h>
 #include <sys/wait.h>

diff --git a/common/parse.c b/common/parse.c
index 8b218c6af4499f601f32b5bee563ea570724d0aa..3ac4ebf7587d10ceb2444ee30ae59afdc703eb4d 100644 (file)
--- a/common/parse.c
+++ b/common/parse.c
@@ -27,6 +27,7 @@
  */
 
 #include "dhcpd.h"
+#include <isc/util.h>
 #include <syslog.h>
 
 struct collection default_collection = { NULL, "default", NULL };

diff --git a/common/socket.c b/common/socket.c
index 24b5848e0cb424e87140e9601e50645cb3628be5..89ae046babd783bcb1d8af1d1cb8805a5f517d28 100644 (file)
--- a/common/socket.c
+++ b/common/socket.c
@@ -35,6 +35,7 @@
  */
 
 #include "dhcpd.h"
+#include <isc/util.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>

diff --git a/omapip/connection.c b/omapip/connection.c
index 4d53b2658ee7b14ce99aed475249b153c66963e2..014ff21b297d71fbc4c3894f0c35d1babaac1bbe 100644 (file)
--- a/omapip/connection.c
+++ b/omapip/connection.c
@@ -27,7 +27,7 @@
  */
 
 #include "dhcpd.h"
-
+#include <isc/util.h>
 #include <omapip/omapip_p.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>