rpms/dhcp/F-9 dhcp-4.0.0-ldap-configuration.patch, 1.7, 1.8 dhcp.spec, 1.212, 1.213

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24642

Modified Files:
	dhcp-4.0.0-ldap-configuration.patch dhcp.spec 
Log Message:
* Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-19
- Fix ldap patch for dhcpd so it can find its config file (#452985)


dhcp-4.0.0-ldap-configuration.patch:

Index: dhcp-4.0.0-ldap-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/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	30 Sep 2008 23:39:50 -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/F-9/dhcp.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- dhcp.spec	6 Aug 2008 19:39:59 -0000	1.212
+++ dhcp.spec	30 Sep 2008 23:39:50 -0000	1.213
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  18%{?dist}
+Release:  19%{?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.
@@ -430,6 +430,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Sep 30 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-19
+- Fix ldap patch for dhcpd so it can find its config file (#452985)
+
 * Wed Aug 06 2008 David Cantrell <dcantrell at redhat.com> - 12:4.0.0-18
 - Remove 'c' from the domain-search format string in common/tables.c
 - Prevent \032 from appearing in resolv.conf search line (#450042)