svn commit: samba r11127 - in branches/SAMBA_3_0/packaging/Fedora: .

[jerry at samba.org]

Author: jerry
Date: 2005-10-17 17:10:44 +0000 (Mon, 17 Oct 2005)
New Revision: 11127

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11127

Log:
patch from S Murthy Kambhampaty <smk_va at yahoo.com> to not start nmbd is 'disable netbios = yes'
Modified:
   branches/SAMBA_3_0/packaging/Fedora/smb.init


Changeset:
Modified: branches/SAMBA_3_0/packaging/Fedora/smb.init
===================================================================
--- branches/SAMBA_3_0/packaging/Fedora/smb.init	2005-10-17 16:58:53 UTC (rev 11126)
+++ branches/SAMBA_3_0/packaging/Fedora/smb.init	2005-10-17 17:10:44 UTC (rev 11127)
@@ -37,40 +37,56 @@
 # Check that we can write to it... so non-root users stop here
 [ -w /etc/samba/smb.conf ] || exit 0
 
+# Check whether "netbios disabled" is true
+ISNETBIOSDISABLED=$(testparm -s 2>/dev/null | \
+	sed -n '/\[global\]/,/^$/p' | \
+	grep "disable netbios = Yes" | \
+	awk 'BEGIN{FS=" = "}{print $2}')
 
+
 RETVAL=0
 
 
 start() {
-        KIND="SMB"
+	KIND="SMB"
 	echo -n $"Starting $KIND services: "
 	daemon smbd $SMBDOPTIONS
 	RETVAL=$?
 	echo
-        KIND="NMB"
-	echo -n $"Starting $KIND services: "
-	daemon nmbd $NMBDOPTIONS
-	RETVAL2=$?
-	echo
-	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \
-	   RETVAL=1
+	KIND="NMB"
+	if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then
+		echo -n $"Starting $KIND services: "
+		daemon nmbd $NMBDOPTIONS
+		RETVAL2=$?
+		echo
+		[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \
+			RETVAL=1
+	else
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/smb || \
+			RETVAL=1
+	fi
 	return $RETVAL
 }	
 
 stop() {
-        KIND="SMB"
+	KIND="SMB"
 	echo -n $"Shutting down $KIND services: "
 	killproc smbd -TERM
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid
 	echo
 	KIND="NMB"
-	echo -n $"Shutting down $KIND services: "
-	killproc nmbd -TERM
-	RETVAL2=$?
-	[ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid
-	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb 
-	echo ""
+	if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then
+		echo -n $"Shutting down $KIND services: "
+		killproc nmbd -TERM
+		RETVAL2=$?
+		[ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid
+		[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb 
+		echo ""
+	else
+		[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/smb 
+		echo ""
+	fi
 	return $RETVAL
 }