X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=smb.init;h=fe78227ce81724b140a42e7e299a01338fbe9737;hb=62dc8910d3e50ca65013462ac29e7616c1f263e3;hp=94c42fec8108b928e2e0956b0db6f212eb59c559;hpb=63e16999cead32e89791bf4fd193e8a538ac3c53;p=packages%2Fsamba.git

diff --git a/smb.init b/smb.init
index 94c42fe..fe78227 100644
--- a/smb.init
+++ b/smb.init
@@ -6,6 +6,8 @@
 #
 # config:	/etc/samba/smb.conf
 # config:	/etc/samba/lmhosts
+# processname:	nmbd
+# processname:	smbd
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
@@ -20,7 +22,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network ]; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
 		msg_network_down smb
 		exit 1
 	fi
@@ -29,31 +31,26 @@ else
 fi
 
 TMPDIR="/tmp"; export TMPDIR
+unset TMP || :
 
 # Check that smb.conf exists.
 [ -f /etc/samba/smb.conf ] || exit 0
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/smb ]; then
 		msg_starting smbd
-		daemon $NICELEVEL smbd -D
+		daemon smbd -D
 		RETVAL=$?
 		msg_starting nmbd
-		daemon $NICELEVEL nmbd -D
-		[ $RETVAL -eq 0 ] && RETVAL=$?
-		if [ "$WINBINDD" = "yes" ]; then
-			msg_starting winbindd
-			daemon $NICELEVEL winbindd
-		fi
+		daemon nmbd -D
 		[ $RETVAL -eq 0 ] && RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/smb
 	else
 		msg_already_running smb
-		exit 1
 	fi
 	;;
   stop)
@@ -63,26 +60,23 @@ case "$1" in
 		killproc smbd
 		msg_stopping nmbd
 		killproc nmbd
-		if [ "$WINBINDD" = "yes" ]; then
-			msg_stopping winbindd
-			killproc winbindd
-		fi
 		rm -f /var/lock/subsys/smb >/dev/null 2>&1
 	else
 		msg_not_running smb
-		exit 1
 	fi
 	;;
   status)
 	status smbd
+	RETVAL=$?
 	status nmbd
-	status winbindd
+	RET=$?
+	[ $RETVAL -eq 0 ] && RETVAL=$RET
 	smbstatus
-	exit $?
 	;;
   restart)
 	$0 stop
 	$0 start
+	exit $?
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/smb ]; then
@@ -91,12 +85,12 @@ case "$1" in
 		RETVAL=$?
 	else
 		msg_not_running smb
-		exit 1
+		exit 7
 	fi
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-	exit 1
+	exit 3
 esac
 
 exit $RETVAL