diff options
| author | Thomas Markwalder <tmark@isc.org> | 2017-10-19 13:28:42 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2017-10-19 13:28:42 -0400 |
| commit | 8560888c6bcffa4bc88cb9532abbf9cd3d441e0a (patch) | |
| tree | b4702d303ea51f5f376717b9efc92bd4774d8435 | |
| parent | de4e14476e0ad01122b91b93f83265535685383f (diff) | |
| download | isc-dhcp-8560888c6bcffa4bc88cb9532abbf9cd3d441e0a.tar.gz | |
[v4_3] Added include of isc/util.h as needed
Merges in 46332.
| -rw-r--r-- | RELNOTES | 7 | ||||
| -rw-r--r-- | client/dhclient.c | 5 | ||||
| -rw-r--r-- | common/execute.c | 1 | ||||
| -rw-r--r-- | common/parse.c | 1 | ||||
| -rw-r--r-- | common/socket.c | 1 | ||||
| -rw-r--r-- | omapip/connection.c | 2 |
6 files changed, 14 insertions, 3 deletions
@@ -66,6 +66,13 @@ We welcome comments from DHCP users, about this or anything else we do. Email Vicky Risk, Product Manager at vicky@isc.org or discuss on dhcp-users@lists.isc.org. + Changes since 4.3.6 + +- 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 declaration errors for POST() and INSIST(). + [ISC-bugs #46332] + Changes since 4.3.6b1 - None diff --git a/client/dhclient.c b/client/dhclient.c index dcf3f1a5..c5b6282a 100644 --- 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 fa4e0f8d..03e147e0 100644 --- 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 15362286..97c6a9c5 100644 --- a/common/parse.c +++ b/common/parse.c @@ -27,6 +27,7 @@ */ #include "dhcpd.h" +#include <isc/util.h> #include <syslog.h> /* Enumerations can be specified in option formats, and are used for diff --git a/common/socket.c b/common/socket.c index 8f5e2f64..c1886ed1 100644 --- 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 9aac0c80..55ebbb3f 100644 --- a/omapip/connection.c +++ b/omapip/connection.c @@ -28,7 +28,7 @@ */ #include "dhcpd.h" - +#include <isc/util.h> #include <omapip/omapip_p.h> #include <arpa/inet.h> #include <arpa/nameser.h> |