pool/dhcp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed ldap option number conflicting with new options (bnc#625358)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=33
This commit is contained in:
Marius Tomaschewski 2010-07-27 13:34:34 +00:00 committed by Git OBS Bridge
parent a555842b9c
commit 69130efed3
3 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dhcp-4.1.1-ldap-patch-mt-01_option-numbers.diff Normal file
View File

@ -0,0 +1,57 @@
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

5
dhcp.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 27 13:31:09 UTC 2010 - mt@suse.de
- Fixed ldap option number conflicting with new options (bnc#625358)
-------------------------------------------------------------------
Fri Jul 2 10:48:21 UTC 2010 - mt@suse.de

4
dhcp.spec
View File

@ -33,7 +33,7 @@ License: BSD3c(or similar)
Group: Productivity/Networking/Boot/Servers
AutoReqProv: on
Version: 4.1.1.P1
Release: 2
Release: 3
Summary: Common Files Used by ISC DHCP Software
Url: http://www.isc.org/software/dhcp
Source0: dhcp-%{isc_version}.tar.bz2
@ -78,6 +78,7 @@ Patch21: dhcp-4.1.1-dhclient-send-hostname-rml.diff
## patch lives here: http://www.suse.de/~mt/git/dhcp-ldap.git/
%if 0%{?with_ldap:1}
Patch30: dhcp-4.1.1-ldap-patch-mt-01.diff.bz2
Patch31: dhcp-4.1.1-ldap-patch-mt-01_option-numbers.diff
%else
Patch30: dhcp-4.1.1-dhclient-no-libcrypto.diff
%endif
@ -201,6 +202,7 @@ Authors:
%patch21 -p1
%if 0%{?with_ldap:%with_ldap}
%patch30 -p1
%patch31 -p1
%else
%patch30 -p1
%endif