From 7f910e2c45e30bcd9da1cb3dcd60495c92460b4f Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Sep 30 2008 23:39:50 +0000 Subject: - Fix ldap patch for dhcpd so it can find its config file (#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 721584d..3644707 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -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 @@ fi %{_libdir}/libdhcp4client.so %changelog +* Tue Sep 30 2008 David Cantrell - 12:4.0.0-19 +- Fix ldap patch for dhcpd so it can find its config file (#452985) + * Wed Aug 06 2008 David Cantrell - 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)