[Pkg-samba-maint] r1087 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-06-20 16:35:19 +0000 (Tue, 20 Jun 2006)
New Revision: 1087

Added:
   trunk/winbind.postinst
Modified:
   trunk/changelog
   trunk/control
   trunk/control.in
   trunk/winbind.init
Log:
* Made winbind init script more careful about returning proper exit code
* Added winbindd_priv group as owner of winbindd_privileged directory.
  Closes: #307257


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-06-20 09:48:40 UTC (rev 1086)
+++ trunk/changelog	2006-06-20 16:35:19 UTC (rev 1087)
@@ -45,10 +45,13 @@
   * Updated to debhelper level 5
   * Rearranged dh_strip calls so that build succeeds with
     DEB_BUILD_OPTIONS=nostrip. Closes: #288995
-  * Create /var/spool/samba and use it as default printer spool
-    (closes: #275241)
+  * Create /var/spool/samba and use it as default printer spool.
+    Closes: #275241
+  * Made winbind init script more careful about returning proper exit code
+  * Added winbindd_priv group as owner of winbindd_privileged directory.
+    Closes: #307257
 
- -- Christian Perrier <bubulle at debian.org>  Tue, 13 Jun 2006 22:09:03 +0200
+ -- Christian Perrier <bubulle at debian.org>  Tue, 20 Jun 2006 18:18:47 +0200
 
 samba (3.0.22-1) unstable; urgency=medium
 

Modified: trunk/control
===================================================================
--- trunk/control	2006-06-20 09:48:40 UTC (rev 1086)
+++ trunk/control	2006-06-20 16:35:19 UTC (rev 1087)
@@ -170,7 +170,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${Source-Version}), lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${Source-Version}), lsb-base (>= 3.0-6), adduser
 Replaces: samba (<= 2.2.3-2)
 Description: service to resolve user and group information from Windows NT servers
  This package provides the winbindd daemon, which provides a

Modified: trunk/control.in
===================================================================
--- trunk/control.in	2006-06-20 09:48:40 UTC (rev 1086)
+++ trunk/control.in	2006-06-20 16:35:19 UTC (rev 1087)
@@ -170,7 +170,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${Source-Version}), lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${Source-Version}), lsb-base (>= 3.0-6), adduser
 Replaces: samba (<= 2.2.3-2)
 Description: service to resolve user and group information from Windows NT servers
  This package provides the winbindd daemon, which provides a

Modified: trunk/winbind.init
===================================================================
--- trunk/winbind.init	2006-06-20 09:48:40 UTC (rev 1086)
+++ trunk/winbind.init	2006-06-20 16:35:19 UTC (rev 1087)
@@ -18,37 +18,41 @@
 
 . /lib/lsb/init-functions
 
+
+d_start() {
+	mkdir -p /var/run/samba/winbindd_privileged || return 1
+	chgrp winbindd_priv /var/run/samba/winbindd_privileged/ || return 1
+	chmod 0750 /var/run/samba/winbindd_privileged/ || return 1
+	start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- $WINBINDD_OPTS
+}
+
+
+d_stop() {
+	start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+}
+
+
 case "$1" in
 	start)
 		log_daemon_msg "Starting the Winbind daemon" "winbind"
-
-		start-stop-daemon --start --quiet --exec $DAEMON -- $WINBINDD_OPTS
-
+		d_start
 		log_end_msg $?
 		;;
 
 	stop)
 		log_daemon_msg "Stopping the Winbind daemon" "winbind"
-
-		start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
-
+		d_stop
 		log_end_msg $?
 		;;
 
 	restart|force-reload)
 		log_daemon_msg "Restarting the Winbind daemon" "winbind"
-
-		start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
-		sleep 2
-		start-stop-daemon --start --quiet --exec $DAEMON -- $WINBINDD_OPTS
-
+		d_start && sleep 2 && d_stop
 		log_end_msg $?
 		;;
+
 	*)
 		echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload}"
 		exit 1
 		;;
 esac
-
-exit 0
-

Added: trunk/winbind.postinst
===================================================================
--- trunk/winbind.postinst	2006-06-20 09:48:40 UTC (rev 1086)
+++ trunk/winbind.postinst	2006-06-20 16:35:19 UTC (rev 1087)
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+set -e
+
+getent group winbindd_priv >/dev/null 2>&1 ||
+	addgroup --system --force-badname --quiet winbindd_priv
+
+#DEBHELPER#