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

[bubulle at alioth.debian.org]

tags 606320 pending
thanks

Author: bubulle
Date: 2011-05-12 10:52:01 +0000 (Thu, 12 May 2011)
New Revision: 3764

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.init
Log:
Test the presence of testparm before trying to use it in init script
Closes: #606320

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-05-12 08:49:40 UTC (rev 3763)
+++ trunk/samba/debian/changelog	2011-05-12 10:52:01 UTC (rev 3764)
@@ -11,6 +11,8 @@
   [ Christian Perrier ]
   * Use db_settitle in debconf questions and make these
     titles translatable
+  * Test the presence of testparm before trying to use it in init script
+    Closes: #606320
 
   [ Christian Perrier ]
   * French (Christian Perrier)

Modified: trunk/samba/debian/samba.init
===================================================================
--- trunk/samba/debian/samba.init	2011-05-12 08:49:40 UTC (rev 3763)
+++ trunk/samba/debian/samba.init	2011-05-12 10:52:01 UTC (rev 3764)
@@ -36,7 +36,10 @@
 		# Make sure we have our PIDDIR, even if it's on a tmpfs
 		install -o root -g root -m 755 -d $PIDDIR
 
-		NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		if [ -n `which testparm` ]
+		then
+			NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		fi
 		if [ "$NMBD_DISABLED" != 'Yes' ]; then
 			log_progress_msg "nmbd"
 			if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd -- -D