- rel 1

[packages/samba.git] / smb.init

diff --git a/smb.init b/smb.init
old mode 100644 (file)
new mode 100755 (executable)
index f152899..9b7f923
--- a/smb.init
+++ b/smb.init
@@ -17,8 +17,9 @@
 
 # Set default config
 CFGFILE="/etc/samba/smb.conf"
-smbd_pidfile="/var/run/smbd.pid"
-nmbd_pidfile="/var/run/nmbd.pid"
+smbd_pidfile="/var/run/samba/smbd.pid"
+nmbd_pidfile="/var/run/samba/nmbd.pid"
+lockname=smb
 
 # Demon specified configuration.
 . /etc/sysconfig/samba
@@ -33,12 +34,17 @@ else
        exit 0
 fi
 
-TMPDIR="/tmp"; export TMPDIR
+export TMPDIR=/tmp
 unset TMP || :
 
 start() {
+       SERVER_ROLE=$(samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -n1)
+       if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
+               exit 0
+       fi
+
        # Check if the service is already running?
-       if [ -f /var/lock/subsys/smb ]; then
+       if [ -f /var/lock/subsys/$lockname ]; then
                msg_already_running "Samba SMB/CIFS Server"
                return
        fi
@@ -46,17 +52,20 @@ start() {
        msg_starting "Samba SMB/CIFS Server"
        daemon /usr/sbin/smbd -D -s $CFGFILE
        RETVAL=$?
-       msg_starting "Samba NetBIOS Name Server"
-       daemon /usr/sbin/nmbd -D $CFGFILE
-       [ $RETVAL -eq 0 ] && RETVAL=$?
+       NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+       if [ "$NMBD_DISABLED" != Yes ]; then
+               msg_starting "Samba NetBIOS Name Server"
+               daemon /usr/sbin/nmbd -D $CFGFILE
+               [ $RETVAL -eq 0 ] && RETVAL=$?
+       fi
        if [ $RETVAL -eq 0 ]; then
-               touch /var/lock/subsys/smb
+               touch /var/lock/subsys/$lockname
        fi
 }
 
 stop() {
        # Stop daemons.
-       if [ ! -f /var/lock/subsys/smb ]; then
+       if [ ! -f /var/lock/subsys/$lockname ]; then
                msg_not_running "Samba SMB/CIFS Server"
                return
        fi
@@ -66,11 +75,11 @@ stop() {
 
        msg_stopping "Samba NetBIOS Name Server"
        killproc --pidfile $nmbd_pidfile nmbd
-       rm -f /var/lock/subsys/smb >/dev/null 2>&1
+       rm -f /var/lock/subsys/$lockname >/dev/null 2>&1
 }
 
 reload() {
-       if [ ! -f /var/lock/subsys/smb ]; then
+       if [ ! -f /var/lock/subsys/$lockname ]; then
                msg_not_running "Samba SMB/CIFS Server"
                RETVAL=7
                return
@@ -82,7 +91,7 @@ reload() {
 }
 
 condrestart() {
-       if [ ! -f /var/lock/subsys/smb ]; then
+       if [ ! -f /var/lock/subsys/$lockname ]; then
                msg_not_running "Samba SMB/CIFS Server"
                RETVAL=$1
                return