[dhcp] Dhcpd does not correctly follow DhcpFailOverPeerDN (#838400)

[Tomas Hozza]

commit 6e8741e2ed7a2dfcc79016690a3aa612d1082863
Author: Tomas Hozza <thozza at redhat.com>
Date:   Mon Jul 23 13:09:27 2012 +0200

    Dhcpd does not correctly follow DhcpFailOverPeerDN (#838400)

 dhcp-4.2.4-failOverPeer.patch |   12 ++++++++++++
 dhcp.spec                     |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/dhcp-4.2.4-failOverPeer.patch b/dhcp-4.2.4-failOverPeer.patch
new file mode 100644
index 0000000..1b0da7e
--- /dev/null
+++ b/dhcp-4.2.4-failOverPeer.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.4/server/ldap.c.failOverPeer dhcp-4.2.4/server/ldap.c
+--- dhcp-4.2.4/server/ldap.c.failOverPeer	2012-07-23 12:53:26.815262322 +0200
++++ dhcp-4.2.4/server/ldap.c	2012-07-23 12:54:31.002119299 +0200
+@@ -893,7 +893,7 @@ ldap_start (void)
+ static void
+ parse_external_dns (LDAPMessage * ent)
+ {
+-  char *search[] = {"dhcpOptionsDN", "dhcpSharedNetworkDN", "dhcpSubnetDN",
++  char *search[] = {"dhcpFailOverPeerDN", "dhcpOptionsDN", "dhcpSharedNetworkDN", "dhcpSubnetDN",
+                     "dhcpGroupDN", "dhcpHostDN", "dhcpClassesDN",
+                     "dhcpPoolDN", NULL};
+   LDAPMessage * newres, * newent;
diff --git a/dhcp.spec b/dhcp.spec
index 9d50afe..f6cdeb9 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.4
-Release:  4%{?dist}
+Release:  5%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -73,6 +73,7 @@ Patch38:  dhcp-4.2.3-P2-log_perror.patch
 Patch39:  dhcp-4.2.4-getifaddrs.patch
 Patch40:  dhcp-4.2.4-send_release.patch
 Patch41:  dhcp-4.2.3-P2-rfc5970-dhcpv6-options-for-network-boot.patch
+Patch42:  dhcp-4.2.4-failOverPeer.patch 
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -300,6 +301,9 @@ rm bind/bind.tar.gz
 # RFC5970 - DHCPv6 Options for Network Boot (#798735)
 %patch41 -p1 -b .rfc5970
 
+# Dhcpd does not correctly follow DhcpFailOverPeerDN (#838400)
+%patch42 -p1 -b .failOverPeer
+
 pushd contrib
 %{__chmod} -x 3.0b1-lease-convert dhclient-tz-exithook.sh ldap/dhcpd-conf-to-ldap
 %{__chmod} -x sethostname.sh solaris.init
@@ -567,6 +571,9 @@ fi
 
 
 %changelog
+* Mon Jul 23 2012 Tomas Hozza <thozza at redhat.com> - 12:4.2.4-5
+- Dhcpd does not correctly follow DhcpFailOverPeerDN (#838400)
+
 * Wed Jul 18 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-4
 - allow dhcpd to listen on alias interfaces (#840601)