rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- 'server' -> 'service' in dhclient-script (#462343)

Browse Source 
- Fix dhcpd so it can find configuration data via LDAP (#452985)
This commit is contained in:
David Cantrell 2008-09-29 19:09:29 +00:00
parent 2d1ec1921c
commit 8a3e2aa7de
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhcp-4.0.0-ldap-configuration.patch
View File

@ -1073,8 +1073,8 @@ diff -up /dev/null dhcp-4.0.0/server/ldap.c
+ creds.bv_val = strdup(ldap_password); + creds.bv_val = strdup(ldap_password);
+ creds.bv_len = strlen(ldap_password); + creds.bv_len = strlen(ldap_password);
+ +
+ if ((ret == ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE, + if ((ret = ldap_sasl_bind_s (ld, ldap_username, LDAP_SASL_SIMPLE,
+ &creds, NULL, NULL, NULL)) != LDAP_SUCCESS) + &creds, NULL, NULL, NULL)) != LDAP_SUCCESS)
+ { + {
+ log_error ("Error: Cannot login into ldap server %s:%d: %s", + log_error ("Error: Cannot login into ldap server %s:%d: %s",
+ ldap_server, ldap_port, ldap_err2string (ret)); + ldap_server, ldap_port, ldap_err2string (ret));
@ -1478,7 +1478,7 @@ diff -up /dev/null dhcp-4.0.0/server/ldap.c
+ return (EOF); + return (EOF);
+ +
+ cfile->bufix = 1; + cfile->bufix = 1;
+ cfile->buflen = strlen (cfile->inbuf); + cfile->buflen = strlen (cfile->inbuf) - 1;
+ if (cfile->buflen > 0) + if (cfile->buflen > 0)
+ ldap_write_debug (cfile->inbuf, cfile->buflen); + ldap_write_debug (cfile->inbuf, cfile->buflen);
+ +

3
dhcp.spec
View File

@ -440,8 +440,9 @@ fi
%{_libdir}/libdhcp4client.so %{_libdir}/libdhcp4client.so
%changelog %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) - '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 * Fri Aug 29 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-23
- Prevent $metric from being set to '' (#460640) - Prevent $metric from being set to '' (#460640)