[Pkg-samba-maint] r2340 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

tags 488275 pending
thanks

Author: bubulle
Date: 2009-01-17 10:11:33 +0000 (Sat, 17 Jan 2009)
New Revision: 2340

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/samba.init
   branches/samba/experimental/debian/winbind.init
Log:
Add 'status' to init scripts


Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2009-01-16 09:57:21 UTC (rev 2339)
+++ branches/samba/experimental/debian/changelog	2009-01-17 10:11:33 UTC (rev 2340)
@@ -6,6 +6,8 @@
 
   [ Christian Perrier ]
   * Use double quotation marks in debconf templates
+  * Add 'status" option to init scripts. Thansk to Dustin Kirkland for
+    providing the patch. Closes: #488275
 
   [ Debconf translations ]
   * Asturian added. Closes: #511730

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2009-01-16 09:57:21 UTC (rev 2339)
+++ branches/samba/experimental/debian/control	2009-01-17 10:11:33 UTC (rev 2340)
@@ -10,7 +10,7 @@
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, update-inetd, adduser
+Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools
 Replaces: samba-common (<= 2.0.5a-2)
 Description: SMB/CIFS file, print, and login server for Unix

Modified: branches/samba/experimental/debian/samba.init
===================================================================
--- branches/samba/experimental/debian/samba.init	2009-01-16 09:57:21 UTC (rev 2339)
+++ branches/samba/experimental/debian/samba.init	2009-01-17 10:11:33 UTC (rev 2340)
@@ -98,8 +98,22 @@
 		sleep 1
 		$0 start
 		;;
+        status)
+		status="0"
+		NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		if [ "$NMBD_DISABLED" != "Yes" ]; then
+			status_of_proc -p $NMBDPID /usr/sbin/nmbd nmbd || status=$?
+		fi
+		if [ "$RUN_MODE" != "inetd" ]; then
+			status_of_proc -p $SMBDPID /usr/sbin/smbd smbd || status=$?
+		fi
+		if [ "$NMBD_DISABLED" = "Yes" -a "$RUN_MODE" = "inetd" ]; then
+			status="4"
+		fi
+		exit $status
+		;;
 	*)
-		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
+		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload|status}"
 		exit 1
 		;;
 esac

Modified: branches/samba/experimental/debian/winbind.init
===================================================================
--- branches/samba/experimental/debian/winbind.init	2009-01-16 09:57:21 UTC (rev 2339)
+++ branches/samba/experimental/debian/winbind.init	2009-01-17 10:11:33 UTC (rev 2340)
@@ -16,6 +16,7 @@
 
 DAEMON=/usr/sbin/winbindd
 PIDDIR=/var/run/samba
+WINBINDPID=$PIDDIR/winbindd.pid
 
 # clear conflicting settings from the environment
 unset TMPDIR
@@ -47,8 +48,11 @@
 		$0 stop && sleep 2 && $0 start
 		;;
 
+	status)
+		status_of_proc -p $WINBINDPID $DAEMON winbind && exit 0 || exit $?
+
 	*)
-		echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload}"
+		echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload|status}"
 		exit 1
 		;;
 esac