From aab892954b8ee5a60ea196d7a604a77ef1b4f0ce Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Feb 11 2005 01:22:10 +0000
Subject: fix bugs 147375 147502 146600 146524 147739


---

diff --git a/dhcp.spec b/dhcp.spec
index a2ad32d..f10395f 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -140,11 +140,11 @@ int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
 EOF
 cc -o findptrsize findptrsize.c
 [ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
-#%ifarch s390 s390x
-#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
-#%else
-#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
-#%endif
+%ifarch s390 s390x
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
+%else
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
+%endif
 #RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'`
 ./configure --copts "$RPM_OPT_FLAGS"
 # -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3"
diff --git a/dhcpd.init b/dhcpd.init
index d53e542..731c738 100644
--- a/dhcpd.init
+++ b/dhcpd.init
@@ -27,17 +27,30 @@ prog="dhcpd"
 
 configtest()
 {
-	/usr/sbin/dhcpd -t	
+        CFA=''
+        if [[ "$DHCPDARGS" = *-cf* ]]; then
+	    CFA=`echo $DHCPDARGS | sed 's/^.*-cf[\ \	]*/-cf/;s/[\ \	].*$//'`;
+        fi;
+	/usr/sbin/dhcpd -t $CFA	
 	return $?
 }
 
 start() {
 	# Start daemons.
 	echo -n $"Starting $prog: "
-	daemon /usr/sbin/dhcpd ${DHCPDARGS}
+	daemon /usr/sbin/dhcpd 2>/dev/null
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd
+	if [ $RETVAL -eq 0 ]; then 
+	    touch /var/lock/subsys/dhcpd
+	    if [ -x /usr/bin/logger ]; then
+		/usr/bin/logger -t dhcpd 'dhcpd startup succeeded'
+	    fi;
+	else
+	    if [ -x /usr/bin/logger ]; then
+		/usr/bin/logger -t dhcpd 'dhcpd startup failed'
+	    fi;
+        fi
 	return $RETVAL
 }
 
@@ -47,7 +60,16 @@ stop() {
 	killproc dhcpd
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dhcpd
+	if [ $RETVAL -eq 0 ]; then
+           rm -f /var/lock/subsys/dhcpd
+	   if [ -x /usr/bin/logger ]; then
+		/usr/bin/logger -t dhcpd 'dhcpd shutdown succeeded'
+	   fi;
+	else
+	   if [ -x /usr/bin/logger ]; then
+		/usr/bin/logger -t dhcpd 'dhcpd shutdown failed'
+	   fi;
+	fi
 	return $RETVAL
 }