[Pkg-dspam-misc] Bug#483868: dspam /etc/init.d/dspam ignores $USER (chown and start-stop-daemon)

[Daniel Hahler]

Package: dspam
Version: 3.6.8-8
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu hardy ubuntu-patch

It seems like the fix for #385760 was not complete.

Bernhard Wodok reported in https://launchpad.net/bug/232543 two missing
occurrences where $USER should get used.


*** /tmp/tmphBv9gy
In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/dspam.init:
    - use $USER for chowning $PIDFILE and starting the daemon (not only for
      the test start)
    - Patch from Bernhard Wodok (LP: #232543). Thanks.

We thought you might be interested in doing the same. 
-------------- next part --------------
diff -u dspam-3.6.8/debian/changelog dspam-3.6.8/debian/changelog
diff -u dspam-3.6.8/debian/dspam.init dspam-3.6.8/debian/dspam.init
--- dspam-3.6.8/debian/dspam.init
+++ dspam-3.6.8/debian/dspam.init
@@ -31,7 +31,7 @@
 
 # Create directory for PIDFILE, if it does not exist and change ownership.
 test -d $(dirname $PIDFILE) || mkdir -p -m 755 $(dirname $PIDFILE)
-chown dspam $(dirname $PIDFILE)
+chown $USER $(dirname $PIDFILE)
 
 OPTIONS="--daemon $OPTIONS"
 
@@ -42,7 +42,7 @@
 #  1 if daemon was already running
 #  2 if daemon could not be started
   start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER --exec $DAEMON --test > /dev/null || return 1
-  start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $OPTIONS || return 2
+  start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER --exec $DAEMON -- $OPTIONS || return 2
 }
 
 # Stop the daemon