- merge samba3 and samba4 server packages

[packages/samba.git] / smb.init

diff --git a/smb.init b/smb.init
index 699f36669202b3a37f28fa639e4cd63d437954f8..541d58192a2d026d00ce7fe7878df39ea86f56a9 100644 (file)
--- a/smb.init
+++ b/smb.init
@@ -17,6 +17,9 @@
 
 # Set default config
 CFGFILE="/etc/samba/smb.conf"
+smbd_pidfile="/var/run/smbd.pid"
+nmbd_pidfile="/var/run/nmbd.pid"
+lockname=smb
 
 # Demon specified configuration.
 . /etc/sysconfig/samba
@@ -24,7 +27,7 @@ CFGFILE="/etc/samba/smb.conf"
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down smb
+               msg_network_down "Samba SMB/CIFS Server"
                exit 1
        fi
 else
@@ -34,44 +37,76 @@ fi
 TMPDIR="/tmp"; export TMPDIR
 unset TMP || :
 
+SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
+if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
+       exit 0
+fi
+
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/smb ]; then
-               msg_starting smbd
-               daemon /usr/sbin/smbd -D -s $CFGFILE
-               RETVAL=$?
-               msg_starting nmbd
+       if [ -f /var/lock/subsys/$lockname ]; then
+               msg_already_running "Samba SMB/CIFS Server"
+               return
+       fi
+
+       msg_starting "Samba SMB/CIFS Server"
+       daemon /usr/sbin/smbd -D -s $CFGFILE
+       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=$?
-               if [ $RETVAL -eq 0 ]; then
-                       touch /var/lock/subsys/smb
-               fi
-       else
-               msg_already_running smb
+       fi
+       if [ $RETVAL -eq 0 ]; then
+               touch /var/lock/subsys/$lockname
        fi
 }
 
 stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/smb ]; then
-               msg_stopping smbd
-               killproc smbd
-               msg_stopping nmbd
-               killproc nmbd
-               rm -f /var/lock/subsys/smb >/dev/null 2>&1
-       else
-               msg_not_running smb
+       if [ ! -f /var/lock/subsys/$lockname ]; then
+               msg_not_running "Samba SMB/CIFS Server"
+               return
        fi
+
+       msg_stopping "Samba SMB/CIFS Server"
+       killproc --pidfile $smbd_pidfile smbd
+
+       msg_stopping "Samba NetBIOS Name Server"
+       killproc --pidfile $nmbd_pidfile nmbd
+       rm -f /var/lock/subsys/$lockname >/dev/null 2>&1
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/$lockname ]; then
+               msg_not_running "Samba SMB/CIFS Server"
+               RETVAL=7
+               return
+       fi
+
+       msg_reloading "Samba SMB/CIFS Server"
+       killproc --pidfile $smbd_pidfile smbd -HUP
+       RETVAL=$?
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/smb ]; then
-               stop
-               start
-       else
-               msg_not_running smb
+       if [ ! -f /var/lock/subsys/$lockname ]; then
+               msg_not_running "Samba SMB/CIFS Server"
                RETVAL=$1
+               return
        fi
+
+       stop
+       start
+}
+
+rc_status() {
+       status smbd
+       RETVAL=$?
+       status nmbd
+       RET=$?
+       [ $RETVAL -eq 0 ] && RETVAL=$RET
 }
 
 RETVAL=0
@@ -91,22 +126,10 @@ case "$1" in
        condrestart 0
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/smb ]; then
-               msg_reloading smb
-               killproc smbd -HUP
-               RETVAL=$?
-       else
-               msg_not_running smb
-               exit 7
-       fi
+       reload
        ;;
   status)
-       status smbd
-       RETVAL=$?
-       status nmbd
-       RET=$?
-       [ $RETVAL -eq 0 ] && RETVAL=$RET
-       smbstatus
+       rc_status
        ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"