[Pkg-samba-maint] r1085 - trunk

[Christian Perrier]

Author: bubulle
Date: 2006-06-20 09:47:40 +0000 (Tue, 20 Jun 2006)
New Revision: 1085

Added:
   trunk/winbind.default
Modified:
   trunk/changelog
   trunk/winbind.init
Log:
Add support for /etc/default/winbind


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-06-13 20:26:55 UTC (rev 1084)
+++ trunk/changelog	2006-06-20 09:47:40 UTC (rev 1085)
@@ -32,6 +32,7 @@
   * Add (U)MOUNT_CIFS_VENDOR_SUFFIX to VERSION.patch
   * Rewrite debconf templates to be compliant with 6.5.2 of the Developer's
     Reference
+  * Add support for /etc/default/winbind. Closes: #262313, #374411
 
   [ Peter Eisentraut ]
   * Use debian/compat instead of DH_COMPAT

Added: trunk/winbind.default
===================================================================
--- trunk/winbind.default	2006-06-13 20:26:55 UTC (rev 1084)
+++ trunk/winbind.default	2006-06-20 09:47:40 UTC (rev 1085)
@@ -0,0 +1,11 @@
+# Defaults for winbind initscript
+# sourced by /etc/init.d/winbind
+#
+
+#
+# This is a POSIX shell fragment
+#
+
+
+# Winbind configuration
+#WINBINDD_OPTS="-n"

Modified: trunk/winbind.init
===================================================================
--- trunk/winbind.init	2006-06-13 20:26:55 UTC (rev 1084)
+++ trunk/winbind.init	2006-06-20 09:47:40 UTC (rev 1085)
@@ -6,6 +6,8 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
+[ -r /etc/default/winbind ] && . /etc/default/winbind
+
 DAEMON=/usr/sbin/winbindd
 
 # clear conflicting settings from the environment
@@ -20,7 +22,7 @@
 	start)
 		log_daemon_msg "Starting the Winbind daemon" "winbind"
 
-		start-stop-daemon --start --quiet --exec $DAEMON
+		start-stop-daemon --start --quiet --exec $DAEMON -- $WINBINDD_OPTS
 
 		log_end_msg $?
 		;;
@@ -38,7 +40,7 @@
 
 		start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
 		sleep 2
-		start-stop-daemon --start --quiet --exec $DAEMON
+		start-stop-daemon --start --quiet --exec $DAEMON -- $WINBINDD_OPTS
 
 		log_end_msg $?
 		;;