[Pkg-samba-maint] r1473 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-06-27 19:19:43 +0000 (Wed, 27 Jun 2007)
New Revision: 1473

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.init
Log:
Don't start nmbd if 'disable netbios' is set in the config. Closes: #429429.



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-06-27 19:17:53 UTC (rev 1472)
+++ trunk/samba/debian/changelog	2007-06-27 19:19:43 UTC (rev 1473)
@@ -1,3 +1,10 @@
+samba (3.0.25b-2) UNRELEASED; urgency=low
+
+  * Don't start nmbd if 'disable netbios' is set in the config.
+    Closes: #429429.
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 27 Jun 2007 12:12:40 -0700
+
 samba (3.0.25b-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/samba/debian/samba.init
===================================================================
--- trunk/samba/debian/samba.init	2007-06-27 19:17:53 UTC (rev 1472)
+++ trunk/samba/debian/samba.init	2007-06-27 19:19:43 UTC (rev 1473)
@@ -30,11 +30,15 @@
 
 case "$1" in
 	start)
-		log_daemon_msg "Starting Samba daemons" "nmbd"
-
-		if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd -- -D; then
-			log_end_msg 1
-			exit 1
+		log_daemon_msg "Starting Samba daemons"
+		NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		if [ "$NMBD_DISABLED" != 'Yes' ]; then
+			log_progress_msg "nmbd"
+			if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd -- -D
+			then
+				log_end_msg 1
+				exit 1
+			fi
 		fi
 
 		if [ "$RUN_MODE" != "inetd" ]; then