Import ISC DHCP 3.0.1 RC9 client.

4 files changed, 7 insertions, 7 deletions

diff --git a/contrib/isc-dhcp/includes/cf/freebsd.h b/contrib/isc-dhcp/includes/cf/freebsd.h
index 590d0e81ea08..2b6eee2619bf 100644
--- a/contrib/isc-dhcp/includes/cf/freebsd.h
+++ b/contrib/isc-dhcp/includes/cf/freebsd.h
@@ -41,8 +41,6 @@
  * ``http://www.nominum.com''.
  */
 
-#define _ANSI_SOURCE
-
 #include <syslog.h>
 #include <sys/types.h>
 #include <string.h>
diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h
index 155d3bf9a2e8..0db04f7dc1b1 100644
--- a/contrib/isc-dhcp/includes/dhcpd.h
+++ b/contrib/isc-dhcp/includes/dhcpd.h
@@ -272,9 +272,11 @@ typedef enum {
 	FTS_ABANDONED = 5,
 	FTS_RESET = 6,
 	FTS_BACKUP = 7,
-	FTS_LAST = 8
 } binding_state_t;
 
+/* FTS_LAST is the highest value that is valid for a lease binding state. */
+#define FTS_LAST FTS_BACKUP
+
 /* A dhcp lease declaration structure. */
 struct lease {
 	OMAPI_OBJECT_PREAMBLE;
@@ -781,7 +783,7 @@ struct interface_info {
 	int wfdesc;			/* Its write file descriptor, if
 					   different. */
 	unsigned char *rbuf;		/* Read buffer, if required. */
-	size_t rbuf_max;		/* Size of read buffer. */
+	unsigned int rbuf_max;		/* Size of read buffer. */
 	size_t rbuf_offset;		/* Current offset into buffer. */
 	size_t rbuf_len;		/* Length of data in buffer. */
 
@@ -2411,7 +2413,7 @@ int find_hosts_by_uid PROTO ((struct host_decl **, const unsigned char *,
 			      unsigned, const char *, int));
 int find_host_for_network PROTO ((struct subnet **, struct host_decl **,
 				  struct iaddr *, struct shared_network *));
-void new_address_range PROTO ((struct iaddr, struct iaddr,
+void new_address_range PROTO ((struct parse *, struct iaddr, struct iaddr,
 			       struct subnet *, struct pool *,
 			       struct lease **));
 isc_result_t dhcp_lease_free (omapi_object_t *, const char *, int);
diff --git a/contrib/isc-dhcp/includes/site.h b/contrib/isc-dhcp/includes/site.h
index bc8ca465f969..b4d910a0e4ff 100644
--- a/contrib/isc-dhcp/includes/site.h
+++ b/contrib/isc-dhcp/includes/site.h
@@ -89,7 +89,7 @@
 /* Define this if you want all leases written to the lease file, even if
    they are free leases that have never been used. */
 
-#define DEBUG_DUMP_ALL_LEASES
+/* #define DEBUG_DUMP_ALL_LEASES */
 
 /* Define this if you want DHCP failover protocol support in the DHCP
    server. */
diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h
index 91c875f328a8..59e9c280e85c 100644
--- a/contrib/isc-dhcp/includes/version.h
+++ b/contrib/isc-dhcp/includes/version.h
@@ -1,3 +1,3 @@
 /* Current version of ISC DHCP Distribution. */
 
-#define DHCP_VERSION	"V3.0.1rc8"
+#define DHCP_VERSION	"V3.0.1rc9"