From 68249388d6974933059023eea4cf750688e8a11d Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.de>
Date: Tue, 27 Jul 2010 15:27:28 +0200
Subject: [PATCH] Fixed ldap option numbers conflict


diff --git dhcp/includes/dhcpd.h dhcp/includes/dhcpd.h
index 6792497..95c2786 100644
--- dhcp/includes/dhcpd.h
+++ dhcp/includes/dhcpd.h
@@ -677,25 +677,25 @@ struct lease_state {
 #endif
 
 #if defined(LDAP_CONFIGURATION)
-# define SV_LDAP_SERVER			57
-# define SV_LDAP_PORT			58
-# define SV_LDAP_USERNAME		59
-# define SV_LDAP_PASSWORD		60
-# define SV_LDAP_BASE_DN		61
-# define SV_LDAP_METHOD			62
-# define SV_LDAP_DEBUG_FILE		63
-# define SV_LDAP_DHCP_SERVER_CN		64
-# define SV_LDAP_REFERRALS		65
+# define SV_LDAP_SERVER			60
+# define SV_LDAP_PORT			61
+# define SV_LDAP_USERNAME		62
+# define SV_LDAP_PASSWORD		63
+# define SV_LDAP_BASE_DN		64
+# define SV_LDAP_METHOD			65
+# define SV_LDAP_DEBUG_FILE		66
+# define SV_LDAP_DHCP_SERVER_CN		67
+# define SV_LDAP_REFERRALS		68
 #if defined (USE_SSL)
-# define SV_LDAP_SSL			66
-# define SV_LDAP_TLS_REQCERT		67
-# define SV_LDAP_TLS_CA_FILE		68
-# define SV_LDAP_TLS_CA_DIR		69
-# define SV_LDAP_TLS_CERT		70
-# define SV_LDAP_TLS_KEY		71
-# define SV_LDAP_TLS_CRLCHECK		72
-# define SV_LDAP_TLS_CIPHERS		73
-# define SV_LDAP_TLS_RANDFILE		74
+# define SV_LDAP_SSL			69
+# define SV_LDAP_TLS_REQCERT		70
+# define SV_LDAP_TLS_CA_FILE		71
+# define SV_LDAP_TLS_CA_DIR		72
+# define SV_LDAP_TLS_CERT		73
+# define SV_LDAP_TLS_KEY		74
+# define SV_LDAP_TLS_CRLCHECK		75
+# define SV_LDAP_TLS_CIPHERS		76
+# define SV_LDAP_TLS_RANDFILE		77
 #endif
 #endif
 
-- 
1.7.1