From 1dcccc7a2aff946d967c5ba4e0025c1b7a6e7c9190446f381e6653778e46a0b5 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 22 May 2007 13:06:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=6

---
 dhcp.changes |  8 ++++++++
 dhcp.spec    |  7 ++++++-
 rc.dhcpd     | 14 ++++++++------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/dhcp.changes b/dhcp.changes
index b55d2d1..a793a62 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May 22 09:37:59 CEST 2007 - mt@suse.de
+
+- Bug 275592: Added ldap and ndsd to the Should-Start/Stop LSB
+  init info tags of the dhcp-server init script.
+- Bug #241113: Added copying of /etc/openldap/ldap.conf and
+  more base libraries into the chroot jail.
+
 -------------------------------------------------------------------
 Mon May 14 15:31:04 CEST 2007 - mt@suse.de
 
diff --git a/dhcp.spec b/dhcp.spec
index 94d0943..fa85f43 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -23,7 +23,7 @@ License:        BSD License and BSD-like
 Group:          Productivity/Networking/Boot/Servers
 Autoreqprov:    on
 Version:        3.0.5
-Release:        34
+Release:        37
 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
@@ -519,6 +519,11 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %doc %{_mandir}/man3/dhcpctl.3.gz
 
 %changelog
+* Tue May 22 2007 - mt@suse.de
+- Bug 275592: Added ldap and ndsd to the Should-Start/Stop LSB
+  init info tags of the dhcp-server init script.
+- Bug #241113: Added copying of /etc/openldap/ldap.conf and
+  more base libraries into the chroot jail.
 * 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.
diff --git a/rc.dhcpd b/rc.dhcpd
index fbb0a0e..f2a1cf9 100644
--- a/rc.dhcpd
+++ b/rc.dhcpd
@@ -13,9 +13,9 @@
 ### BEGIN INIT INFO
 # Provides:			dhcpd
 # Required-Start:		$local_fs $remote_fs $network 
-# Should-Start:			$named $syslog $time
+# Should-Start:			$named $syslog $time ldap ndsd
 # Required-Stop:		$local_fs $remote_fs $network
-# Should-Stop:			$named $syslog 
+# Should-Stop:			$named $syslog ldap ndsd
 # Default-Start:		3 5
 # Default-Stop:			0 1 2 6
 # Short-Description:		DHCP Server
@@ -57,6 +57,7 @@ DAEMON_CONF=/etc/dhcpd.conf
 DAEMON_PIDFILE=/var/run/dhcpd.pid
 STARTPROC_LOGFILE=/var/log/rc.dhcpd.log
 SUPPORTS_HUP="no"
+LDAP_CONF=/etc/openldap/ldap.conf
 
 # Shell functions sourced from /etc/rc.status:
 #      rc_check         check and set local and overall rc status
@@ -159,7 +160,7 @@ case "$1" in
 	if test "$DHCPD_RUN_CHROOTED" = "yes" ; then 
 		## copy the conf file to the chroot jail (dhcpd has to be restarted anyway, 
 		## when it has changed) and change path to leases file
-		for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES; do
+		for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF; do
 			if test -d "${i}" ; then
 				test -d "$CHROOT_PREFIX/${i}" || \
 				mkdir -p "$CHROOT_PREFIX/${i}"
@@ -169,13 +170,14 @@ case "$1" in
 			fi
 		done
 		rm -f $CHROOT_PREFIX/dev/urandom
-		for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES /etc/{resolv.conf,host.conf,hosts,localtime} /dev/urandom; do
+		for i in $DAEMON_CONF $DHCPD_CONF_INCLUDE_FILES $LDAP_CONF /etc/{resolv.conf,host.conf,hosts,localtime} /dev/urandom; do
 			if ! test -e "$i"; then continue; fi # neither of them is absolutely necessary
-			cp -aL "$i" "$CHROOT_PREFIX/${i%/*}/" &>/dev/null \
+			cp -aL "$i" "${CHROOT_PREFIX}/${i%/*}/" &>/dev/null \
 				|| { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; }
 		done
 		libdir=/$(basename $(echo /var/lib/dhcp/lib*))
-		for i in /$libdir/{libresolv.so.2,libnss_dns{,6}.so.2}; do 
+		for i in /$libdir/{libresolv.so.2,libnss_dns{,6}.so.2} \
+		         /$libdir/{libpthread.so.0,libdl.so.2} ; do 
 			if [ -s "$i" ]; then 
 				cp -pL "$i" "/var/lib/dhcp/$libdir/" \
 				|| { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; }