X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=smb.init;h=9b7f9233f35ea0672bed4f266fe470bfa4c69237;hb=3ef1773;hp=d129f75723add2e09c084d4d36d4809c59eace5d;hpb=bad911ca64aad21d3729287d68bd382812b690ed;p=packages%2Fsamba.git

diff --git a/smb.init b/smb.init
old mode 100644
new mode 100755
index d129f75..9b7f923
--- a/smb.init
+++ b/smb.init
@@ -17,8 +17,8 @@
 
 # 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.
@@ -34,10 +34,15 @@ 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/$lockname ]; then
 		msg_already_running "Samba SMB/CIFS Server"
@@ -47,9 +52,12 @@ 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/$lockname
 	fi