diff options
| author | Francis Dupont <fdupont@isc.org> | 2018-11-29 15:51:59 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2018-11-29 15:51:59 +0100 |
| commit | 479b9293216039206b12f60cb4a2a5fdcf4d109b (patch) | |
| tree | 8003307d0fa6f7e44a8831049265c712dfd26e52 /includes | |
| parent | a5b21e16ff3a58d2262eddfffc4e8937379b016f (diff) | |
| download | isc-dhcp-479b9293216039206b12f60cb4a2a5fdcf4d109b.tar.gz | |
Solved conflict
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/dhcpd.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index b5a25418..92f77f22 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -807,15 +807,15 @@ struct lease_state { #define SV_PERSIST_EUI_64_LEASES 91 #endif #if defined (FAILOVER_PROTOCOL) -#define SV_CHECK_SECS_BYTE_ORDER 91 -#endif -#define SV_DDNS_DUAL_STACK_MIXED_MODE 92 -#define SV_DDNS_GUARD_ID_MUST_MATCH 93 -#define SV_DDNS_OTHER_GUARD_IS_DYNAMIC 94 -#define SV_RELEASE_ON_ROAM 95 -#define SV_LOCAL_ADDRESS6 96 -#define SV_BIND_LOCAL_ADDRESS6 97 -#define SV_PING_CLTT_SECS 98 +#define SV_CHECK_SECS_BYTE_ORDER 92 +#endif +#define SV_DDNS_DUAL_STACK_MIXED_MODE 93 +#define SV_DDNS_GUARD_ID_MUST_MATCH 94 +#define SV_DDNS_OTHER_GUARD_IS_DYNAMIC 95 +#define SV_RELEASE_ON_ROAM 96 +#define SV_LOCAL_ADDRESS6 97 +#define SV_BIND_LOCAL_ADDRESS6 98 +#define SV_PING_CLTT_SECS 99 #if !defined (DEFAULT_PING_TIMEOUT) # define DEFAULT_PING_TIMEOUT 1 |