diff options
| author | murray <murray@FreeBSD.org> | 2003-01-15 10:31:26 +0000 |
|---|---|---|
| committer | murray <murray@FreeBSD.org> | 2003-01-15 10:31:26 +0000 |
| commit | 017255e081bcbadf47f5affc7eea7c047e38a70f (patch) | |
| tree | cf39c38365a0b53bd8bc09fd59f38b2eee8a01cf /contrib/isc-dhcp/includes | |
| parent | a0b500f866e54d9ce8def00d72daac852505461e (diff) | |
| download | FreeBSD-src-017255e081bcbadf47f5affc7eea7c047e38a70f.zip FreeBSD-src-017255e081bcbadf47f5affc7eea7c047e38a70f.tar.gz | |
Import ISC DHCP 3.0.1 RC10 client.
Diffstat (limited to 'contrib/isc-dhcp/includes')
| -rw-r--r-- | contrib/isc-dhcp/includes/dhcpd.h | 6 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/osdep.h | 4 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/version.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h index 0db04f7..891678c 100644 --- a/contrib/isc-dhcp/includes/dhcpd.h +++ b/contrib/isc-dhcp/includes/dhcpd.h @@ -271,7 +271,7 @@ typedef enum { FTS_RELEASED = 4, FTS_ABANDONED = 5, FTS_RESET = 6, - FTS_BACKUP = 7, + FTS_BACKUP = 7 } binding_state_t; /* FTS_LAST is the highest value that is valid for a lease binding state. */ @@ -648,7 +648,7 @@ struct client_lease { struct auth_key *key; /* Key used in basic DHCP authentication. */ unsigned int is_static : 1; /* If set, lease is from config file. */ - unsigned int is_bootp: 1; /* If set, lease was aquired with BOOTP. */ + unsigned int is_bootp: 1; /* If set, lease was acquired with BOOTP. */ struct option_state *options; /* Options supplied with lease. */ }; @@ -903,6 +903,8 @@ typedef unsigned char option_mask [16]; #define _PATH_DHCPD_CONF "dhcpd.conf" #undef _PATH_DHCPD_DB #define _PATH_DHCPD_DB "dhcpd.leases" +#undef _PATH_DHCPD_PID +#define _PATH_DHCPD_PID "dhcpd.pid" #else #ifndef _PATH_DHCPD_CONF #define _PATH_DHCPD_CONF "/etc/dhcpd.conf" diff --git a/contrib/isc-dhcp/includes/osdep.h b/contrib/isc-dhcp/includes/osdep.h index c4486e8..527efd4 100644 --- a/contrib/isc-dhcp/includes/osdep.h +++ b/contrib/isc-dhcp/includes/osdep.h @@ -276,6 +276,10 @@ # define HAVE_ARPHRD_IEEE802 #endif +#if defined (ARPHRD_IEEE802_TR) && !defined (HAVE_ARPHRD_IEEE802_TR) +# define HAVE_ARPHRD_IEEE802_TR +#endif + #if defined (ARPHRD_FDDI) && !defined (HAVE_ARPHRD_FDDI) # define HAVE_ARPHRD_FDDI #endif diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h index 59e9c28..8aeb568 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.1rc9" +#define DHCP_VERSION "V3.0.1rc10" |
