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

[bubulle at alioth.debian.org]

tags 569926 pending
thanks

Author: bubulle
Date: 2010-05-07 12:40:03 +0000 (Fri, 07 May 2010)
New Revision: 3466

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.logrotate
   trunk/samba/debian/winbind.logrotate
Log:
* Avoid winbind's logrotate script to fail when there is no
  /var/run/samba directory. Closes: #569926
* Avoid samba's logrotate script to fail when there is no
  /var/run/samba directory

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-05-07 12:22:41 UTC (rev 3465)
+++ trunk/samba/debian/changelog	2010-05-07 12:40:03 UTC (rev 3466)
@@ -7,6 +7,10 @@
   * Drop deprecated 'share modes' parameter from default smb.conf
     Closes: #580561
   * Enable PIE during configure. Closes: #509135
+  * Avoid winbind's logrotate script to fail when there is no
+    /var/run/samba directory. Closes: #569926
+  * Avoid samba's logrotate script to fail when there is no
+    /var/run/samba directory
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 24 Apr 2010 20:07:56 +0200
 

Modified: trunk/samba/debian/samba.logrotate
===================================================================
--- trunk/samba/debian/samba.logrotate	2010-05-07 12:22:41 UTC (rev 3465)
+++ trunk/samba/debian/samba.logrotate	2010-05-07 12:40:03 UTC (rev 3466)
@@ -14,7 +14,9 @@
 	missingok
 	rotate 7
 	postrotate
-		[ ! -f /var/run/samba/nmbd.pid ] || kill -HUP `cat /var/run/samba/nmbd.pid`
+		if [ -f /var/run/samba/nmbd.pid ]; then
+			kill -HUP `cat /var/run/samba/nmbd.pid` 2>/dev/null
+		fi
 	endscript
 	compress
 	notifempty

Modified: trunk/samba/debian/winbind.logrotate
===================================================================
--- trunk/samba/debian/winbind.logrotate	2010-05-07 12:22:41 UTC (rev 3465)
+++ trunk/samba/debian/winbind.logrotate	2010-05-07 12:40:03 UTC (rev 3466)
@@ -3,7 +3,9 @@
 	missingok
 	rotate 7
 	postrotate
-	[ -f /var/run/samba/winbindd.pid ] && kill -HUP `cat /var/run/samba/winbindd.pid`
+		if [ -f /var/run/samba/winbindd.pid ]; then
+			kill -HUP `cat /var/run/samba/winbindd.pid` 2>/dev/null
+		fi
 	endscript
 	compress
 	notifempty