rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=5

Browse Source
This commit is contained in:
OBS User unknown 2007-05-17 09:27:30 +00:00 committed by Git OBS Bridge
parent 97546f67c9
commit acea850f24
6 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dhcp-3.0.5-ldap-patch_host_brace.dif Normal file
View File

@ -0,0 +1,15 @@
--- server/ldap.c
+++ server/ldap.c 2007/04/26 11:44:01
@@ -165,10 +165,11 @@
x_strncat (cfile->inbuf, "host ", LDAP_BUFFER_SIZE);
x_strncat (cfile->inbuf, tempstr[0], LDAP_BUFFER_SIZE);
+ x_strncat (cfile->inbuf, " {\n", LDAP_BUFFER_SIZE);
if (hwaddr != NULL && hwaddr[0] != NULL)
{
- x_strncat (cfile->inbuf, " {\nhardware ", LDAP_BUFFER_SIZE);
+ x_strncat (cfile->inbuf, "hardware ", LDAP_BUFFER_SIZE);
x_strncat (cfile->inbuf, hwaddr[0], LDAP_BUFFER_SIZE);
x_strncat (cfile->inbuf, ";\n", LDAP_BUFFER_SIZE);
ldap_value_free (hwaddr);

22
dhcp-3.0.5-ldap-patch_server_dn.dif Normal file
View File

@ -0,0 +1,22 @@
--- server/ldap.c
+++ server/ldap.c 2007/04/26 11:42:39
@@ -1477,8 +1477,8 @@
for (cnt=0; tempstr[cnt] != NULL; cnt++)
{
snprintf(sfilter, sizeof(sfilter), "(&(objectClass=dhcpService)"
- "(|(dhcpPrimaryDN=%s)(dhcpSecondaryDN=%s)))",
- hostdn, hostdn);
+ "(|(|(dhcpPrimaryDN=%s)(dhcpSecondaryDN=%s))(dhcpServerDN=%s)))",
+ hostdn, hostdn, hostdn);
ldres = NULL;
if ((ret = ldap_search_s (ld, tempstr[cnt], LDAP_SCOPE_BASE,
sfilter, NULL, 0, &ldres)) != LDAP_SUCCESS)
@@ -1493,7 +1493,7 @@
if ((ent = ldap_first_entry (ld, ldres)) == NULL)
{
- log_error ("Error: Cannot find dhcpService DN '%s' with primary or secondary server reference. Please update the LDAP server entry '%s'",
+ log_error ("Error: Cannot find dhcpService DN '%s' with server reference. Please update the LDAP server entry '%s'",
tempstr[cnt], hostdn);
ldap_msgfree(ldres);

11
dhcp.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon May 14 15:31:04 CEST 2007 - mt@suse.de
- Bug #265337: Fix to generate proper "host ... {" block begin
brace even if no harware address is specified for the host.
New patch file: dhcp-3.0.5-ldap-patch_host_brace.dif
- Bug #258493: Fix to support new dhcpServerDN reference in
dhcpService object search filter.
New patch file: dhcp-3.0.5-ldap-patch_server_dn.dif
- Fixed LSB init info to use LSB 2.0 Should-Start/Should-Stop.
-------------------------------------------------------------------
Thu Mar 15 18:07:35 CET 2007 - mt@suse.de

14
dhcp.spec
View File

@ -23,7 +23,7 @@ License: BSD License and BSD-like
Group: Productivity/Networking/Boot/Servers
Autoreqprov: on
Version: 3.0.5
Release: 21
Release: 34
Summary: Common Files Used by ISC DHCP Software
URL: http://www.isc.org/isc/dhcp.html
Source0: http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@ -71,6 +71,8 @@ Patch53: dhcp-3.0.5-pool_eof.dif
%if %DHCPD_LDAP
Patch60: dhcp-3.0.5-ldap-patch.gz
Patch61: dhcp-3.0.5-ldap-patch_object-order.dif
Patch62: dhcp-3.0.5-ldap-patch_server_dn.dif
Patch63: dhcp-3.0.5-ldap-patch_host_brace.dif
%endif
%if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
Patch70: dhcp-3.0.3b1-pie.dif
@ -207,6 +209,8 @@ Authors:
%if %DHCPD_LDAP
%patch60 -p1
%patch61 -p0
%patch62 -p0
%patch63 -p0
%endif
%if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
%patch70
@ -515,6 +519,14 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%doc %{_mandir}/man3/dhcpctl.3.gz
%changelog
* Mon May 14 2007 - mt@suse.de
- Bug #265337: Fix to generate proper "host ... {" block begin
brace even if no harware address is specified for the host.
New patch file: dhcp-3.0.5-ldap-patch_host_brace.dif
- Bug #258493: Fix to support new dhcpServerDN reference in
dhcpService object search filter.
New patch file: dhcp-3.0.5-ldap-patch_server_dn.dif
- Fixed LSB init info to use LSB 2.0 Should-Start/Should-Stop.
* Thu Mar 15 2007 - mt@suse.de
- Bug #181212: Improved dhcp init-script to copy directories
specified in the DHCPD_CONF_INCLUDE_FILES sysconfig variable

4
rc.dhcpd
View File

@ -13,9 +13,9 @@
### BEGIN INIT INFO
# Provides: dhcpd
# Required-Start: $local_fs $remote_fs $network
# X-UnitedLinux-Should-Start: $named $syslog $time
# Should-Start: $named $syslog $time
# Required-Stop: $local_fs $remote_fs $network
# X-UnitedLinux-Should-Stop: $named $syslog
# Should-Stop: $named $syslog
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: DHCP Server

4
rc.dhcrelay
View File

@ -12,9 +12,9 @@
### BEGIN INIT INFO
# Provides: dhcrelay
# Required-Start: $local_fs $remote_fs $network
# X-UnitedLinux-Should-Start: $named $syslog
# Should-Start: $named $syslog
# Required-Stop:
# X-UnitedLinux-Should-Stop:
# Should-Stop:
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: DHCP Relay