From 309088f8d703e3b71efd68a32c5d19f8d6963a2f Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Sep 29 2008 19:09:29 +0000
Subject: - 'server' -> 'service' in dhclient-script (#462343)

- Fix dhcpd so it can find configuration data via LDAP (#452985)

---

diff --git a/dhcp-4.0.0-ldap-configuration.patch b/dhcp-4.0.0-ldap-configuration.patch
index 03f92d6..3a7a1a7 100644
--- a/dhcp-4.0.0-ldap-configuration.patch
+++ b/dhcp-4.0.0-ldap-configuration.patch
@@ -1073,8 +1073,8 @@ diff -up /dev/null dhcp-4.0.0/server/ldap.c
 +      creds.bv_val = strdup(ldap_password);
 +      creds.bv_len = strlen(ldap_password);
 +
-+      if ((ret == ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE,
-+                                    &creds, NULL, NULL, NULL)) != LDAP_SUCCESS)
++      if ((ret = ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE,
++                                   &creds, NULL, NULL, NULL)) != LDAP_SUCCESS)
 +        {
 +          log_error ("Error: Cannot login into ldap server %s:%d: %s",
 +                     ldap_server, ldap_port, ldap_err2string (ret));
@@ -1478,7 +1478,7 @@ diff -up /dev/null dhcp-4.0.0/server/ldap.c
 +    return (EOF);
 +
 +  cfile->bufix = 1;
-+  cfile->buflen = strlen (cfile->inbuf);
++  cfile->buflen = strlen (cfile->inbuf) - 1;
 +  if (cfile->buflen > 0)
 +    ldap_write_debug (cfile->inbuf, cfile->buflen);
 +
diff --git a/dhcp.spec b/dhcp.spec
index 36573f5..51317d8 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -440,8 +440,9 @@ fi
 %{_libdir}/libdhcp4client.so
 
 %changelog
-* Tue Sep 16 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-24
+* Mon Sep 29 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-24
 - 'server' -> 'service' in dhclient-script (#462343)
+- Fix dhcpd so it can find configuration data via LDAP (#452985)
 
 * Fri Aug 29 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-23
 - Prevent $metric from being set to '' (#460640)