rpms/dhcp/devel dhcp-4.0.0-ldap-configuration.patch, 1.7, 1.8 dhcp.spec, 1.220, 1.221

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22131

Modified Files:
	dhcp-4.0.0-ldap-configuration.patch dhcp.spec 
Log Message:
* Mon Sep 29 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
- 'server' -> 'service' in dhclient-script (#462343)
- Fix dhcpd so it can find configuration data via LDAP (#452985)


dhcp-4.0.0-ldap-configuration.patch:

Index: dhcp-4.0.0-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp-4.0.0-ldap-configuration.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dhcp-4.0.0-ldap-configuration.patch	7 Feb 2008 00:47:26 -0000	1.7
+++ dhcp-4.0.0-ldap-configuration.patch	29 Sep 2008 19:09:29 -0000	1.8
@@ -1073,8 +1073,8 @@
 +      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 @@
 +    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);
 +


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- dhcp.spec	17 Sep 2008 00:42:00 -0000	1.220
+++ dhcp.spec	29 Sep 2008 19:09:29 -0000	1.221
@@ -440,8 +440,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
-* Tue Sep 16 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-24
+* Mon Sep 29 2008 David Cantrell <dcantrell at 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 at redhat.com> - 12:4.0.0-23
 - Prevent $metric from being set to '' (#460640)