r16486: fix RedHat init scripts to rely on OS provided killproc() function

3 files changed, 5 insertions, 12 deletions

diff --git a/packaging/RHEL/setup/smb.init b/packaging/RHEL/setup/smb.init
index 30d7d403dd9..af85b2c079a 100644
--- a/packaging/RHEL/setup/smb.init
+++ b/packaging/RHEL/setup/smb.init
@@ -71,14 +71,14 @@ start() {
 stop() {
 	KIND="SMB"
 	echo -n $"Shutting down $KIND services: "
-	killproc smbd -TERM
+	killproc smbd
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid
 	echo
 	KIND="NMB"
 	if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then
 		echo -n $"Shutting down $KIND services: "
-		killproc nmbd -TERM
+		killproc nmbd 
 		RETVAL2=$?
 		[ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid
 		[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb 
diff --git a/packaging/RHEL/setup/winbind.init b/packaging/RHEL/setup/winbind.init
index e778e61e9cf..a99038f9c71 100644
--- a/packaging/RHEL/setup/winbind.init
+++ b/packaging/RHEL/setup/winbind.init
@@ -49,7 +49,7 @@ stop() {
         echo
 	KIND="Winbind"
 	echo -n $"Shutting down $KIND services: "
-	killproc winbindd -TERM
+	killproc winbindd
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/run/winbindd.pid && rm -f /var/lock/subsys/winbindd
 	echo ""
diff --git a/packaging/RedHat-9/smb.init b/packaging/RedHat-9/smb.init
index 79f4f322d03..9b45ebabb34 100755
--- a/packaging/RedHat-9/smb.init
+++ b/packaging/RedHat-9/smb.init
@@ -30,15 +30,8 @@ case "$1" in
   stop)
 	echo -n "Shutting down SMB services: "
 
-	## we have to get all the smbd process here instead of just the
-	## main parent (i.e. killproc) because it can take a long time
-	## for an individual process to process a TERM signal
-	smbdpids=`ps guax | grep smbd | grep -v grep | awk '{print $2}'`
-	for pid in $smbdpids; do
-		kill -TERM $pid
-	done
-	## nmbd is ok to kill using killproc()
-	killproc nmbd -TERM
+	killproc smbd 
+	killproc nmbd 
 	rm -f /var/lock/subsys/smb
 	echo ""
 	;;