From: Francis Dupont <fdupont@isc.org>
Date: Thu, 29 Nov 2018 14:51:59 +0000 (+0100)
Subject: Solved conflict
X-Git-Tag: v4_4_2b1~29^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=479b9293216039206b12f60cb4a2a5fdcf4d109b;p=thirdparty%2Fdhcp.git

Solved conflict
---

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index b5a254185..92f77f226 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