diff options
| author | Thomas Markwalder <tmark@isc.org> | 2017-10-19 13:21:18 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2017-10-19 13:21:18 -0400 |
| commit | e39b4193964c666e36e02787681da4deb2346398 (patch) | |
| tree | eb837d1df1baea08887c6f452c2f04a50791d22e | |
| parent | 6bc5ad88db24fa66b317b76ddb2a7c18e5747a5d (diff) | |
| download | isc-dhcp-e39b4193964c666e36e02787681da4deb2346398.tar.gz | |
[master] Added include of isc/util.h as needed
Merges in 46332.
| -rw-r--r-- | RELNOTES | 5 | ||||
| -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, 12 insertions, 3 deletions
@@ -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 56511df4..081783b4 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 6a756172..a33cec85 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 8b218c6a..3ac4ebf7 100644 --- 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 24b5848e..89ae046b 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 4d53b265..014ff21b 100644 --- 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> |