diff options
| author | mbr <mbr@FreeBSD.org> | 2003-09-02 11:13:21 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-09-02 11:13:21 +0000 |
| commit | 66b631bbce0f76a8ac8b7e449d641bf2d39e2b7b (patch) | |
| tree | dcd797e5b11946dcf5d76a55949bea79832c181f /contrib/isc-dhcp/includes/dhcpd.h | |
| parent | bc435cf92417e0fa80f81a1072fe670bc5526d51 (diff) | |
| download | FreeBSD-src-66b631bbce0f76a8ac8b7e449d641bf2d39e2b7b.zip FreeBSD-src-66b631bbce0f76a8ac8b7e449d641bf2d39e2b7b.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/isc-dhcp/includes/dhcpd.h')
| -rw-r--r-- | contrib/isc-dhcp/includes/dhcpd.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h index 1b50c6c..376c4f3 100644 --- a/contrib/isc-dhcp/includes/dhcpd.h +++ b/contrib/isc-dhcp/includes/dhcpd.h @@ -425,6 +425,11 @@ struct lease_state { #define SV_UPDATE_STATIC_LEASES 43 #define SV_LOG_FACILITY 44 #define SV_DO_FORWARD_UPDATES 45 +#define SV_PING_TIMEOUT 46 + +#if !defined (DEFAULT_PING_TIMEOUT) +# define DEFAULT_PING_TIMEOUT 1 +#endif #if !defined (DEFAULT_DEFAULT_LEASE_TIME) # define DEFAULT_DEFAULT_LEASE_TIME 43200 |
