- force cups 1.2.0 as smbd linked with cups 1.2.0 doesn't run with cups 1.1.x

[packages/samba.git] / smb.init

diff --git a/smb.init b/smb.init
index e3bb91cbc799df7d4ea390c49921df17fd24bb37..fe78227ce81724b140a42e7e299a01338fbe9737 100644 (file)
--- 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
 
@@ -29,6 +31,7 @@ else
 fi
 
 TMPDIR="/tmp"; export TMPDIR
+unset TMP || :
 
 # Check that smb.conf exists.
 [ -f /etc/samba/smb.conf ] || exit 0
@@ -40,17 +43,11 @@ case "$1" in
        # 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
+               daemon nmbd -D
                [ $RETVAL -eq 0 ] && RETVAL=$?
-               if [ "$WINBINDD" = "yes" ]; then
-                       msg_starting winbindd
-                       daemon $NICELEVEL winbindd
-                       RET=$?
-                       [ $RETVAL -eq 0 ] && RETVAL=$RET
-               fi
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/smb
        else
                msg_already_running smb
@@ -63,10 +60,6 @@ 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
@@ -74,13 +67,10 @@ case "$1" in
        ;;
   status)
        status smbd
-       RETVAL=$?       
+       RETVAL=$?
        status nmbd
        RET=$?
        [ $RETVAL -eq 0 ] && RETVAL=$RET
-       status winbindd
-       RET=$?
-       [ $RETVAL -eq 0 ] && RETVAL=$RET
        smbstatus
        ;;
   restart)
@@ -94,7 +84,7 @@ case "$1" in
                killproc smbd -HUP
                RETVAL=$?
        else
-               msg_not_running smb >&2
+               msg_not_running smb
                exit 7
        fi
        ;;