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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2010-05-07 13:21:29 +0000 (Fri, 07 May 2010)
New Revision: 3467

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.logrotate
   trunk/samba/debian/winbind.logrotate
Log:
revert changes to the samba logrotate script, which are irrelevant since this
script didn't have bug #569926; and bring the winbind logrotate script into
alignment with the existing samba logrotate implementation

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-05-07 12:40:03 UTC (rev 3466)
+++ trunk/samba/debian/changelog	2010-05-07 13:21:29 UTC (rev 3467)
@@ -9,8 +9,6 @@
   * 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:40:03 UTC (rev 3466)
+++ trunk/samba/debian/samba.logrotate	2010-05-07 13:21:29 UTC (rev 3467)
@@ -14,9 +14,7 @@
 	missingok
 	rotate 7
 	postrotate
-		if [ -f /var/run/samba/nmbd.pid ]; then
-			kill -HUP `cat /var/run/samba/nmbd.pid` 2>/dev/null
-		fi
+		[ ! -f /var/run/samba/nmbd.pid ] || kill -HUP `cat /var/run/samba/nmbd.pid`
 	endscript
 	compress
 	notifempty

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