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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-05-22 21:06:56 +0000 (Tue, 22 May 2007)
New Revision: 1398

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.init
   trunk/samba/debian/winbind.init
Log:
Merged a small Ubuntu change: use PIDDIR instead of hardcoding /var/run/samba


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-05-22 20:46:16 UTC (rev 1397)
+++ trunk/samba/debian/changelog	2007-05-22 21:06:56 UTC (rev 1398)
@@ -4,6 +4,8 @@
     - Enforce building with "--with-ads" and therefore fail
       when the build can't be done with kerberos support. 
       Closes: #424637
+  * Merge Ubuntu changes:
+    - use of PIDDIR instead of hardcoding it in samba.init and winbind.init
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 19 May 2007 09:00:56 +0200
 

Modified: trunk/samba/debian/samba.init
===================================================================
--- trunk/samba/debian/samba.init	2007-05-22 20:46:16 UTC (rev 1397)
+++ trunk/samba/debian/samba.init	2007-05-22 21:06:56 UTC (rev 1398)
@@ -16,8 +16,9 @@
 # Reads config file (will override defaults above)
 [ -r /etc/default/samba ] && . /etc/default/samba
 
-NMBDPID=/var/run/samba/nmbd.pid
-SMBDPID=/var/run/samba/smbd.pid
+PIDDIR=/var/run/samba
+NMBDPID=$PIDDIR/nmbd.pid
+SMBDPID=$PIDDIR/smbd.pid
 
 # clear conflicting settings from the environment
 unset TMPDIR

Modified: trunk/samba/debian/winbind.init
===================================================================
--- trunk/samba/debian/winbind.init	2007-05-22 20:46:16 UTC (rev 1397)
+++ trunk/samba/debian/winbind.init	2007-05-22 21:06:56 UTC (rev 1398)
@@ -15,6 +15,7 @@
 [ -r /etc/default/winbind ] && . /etc/default/winbind
 
 DAEMON=/usr/sbin/winbindd
+PIDDIR=/var/run/samba
 
 # clear conflicting settings from the environment
 unset TMPDIR
@@ -29,8 +30,8 @@
 		log_daemon_msg "Starting the Winbind daemon" "winbind"
 
 		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
+		chgrp winbindd_priv $PIDDIR/winbindd_privileged/ || return 1
+		chmod 0750 $PIDDIR/winbindd_privileged/ || return 1
 		start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- $WINBINDD_OPTS
 
 		log_end_msg $?