[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-167-g4319a8f

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 992526702500f1df6a018c8336b68725042af821
Author: Stephen Gran <steve at lobefin.net>
Date:   Fri Jun 12 18:44:22 2009 +0100

    Get rid of ridiculous home rolled suid
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-daemon.init.in b/debian/clamav-daemon.init.in
index 330dbb0..6f1f123 100644
--- a/debian/clamav-daemon.init.in
+++ b/debian/clamav-daemon.init.in
@@ -90,7 +90,7 @@ case "$1" in
   OPTIND=1
   if [ -z "$RUN_SUPERVISED" ] ; then
     log_daemon_msg "Starting $DESC" "$NAME "
-    su "$User" -p -s /bin/sh -c ". /lib/lsb/init-functions && start_daemon -p $THEPIDFILE $DAEMON"
+    start-stop-daemon -c $User --exec $DAEMON
     ret=$?
   else 
     log_daemon_msg "Starting $DESC" "$NAME (supervised) "
diff --git a/debian/clamav-freshclam.init.in b/debian/clamav-freshclam.init.in
index 55f8ff4..61c0e6e 100644
--- a/debian/clamav-freshclam.init.in
+++ b/debian/clamav-freshclam.init.in
@@ -99,7 +99,7 @@ case "$1" in
     log_end_msg 255
     exit 0
   fi
-  su "$DatabaseOwner" -p -s /bin/sh -c ". /lib/lsb/init-functions && start_daemon $DAEMON -d --quiet"
+  start-stop-daemon -c "$DatabaseOwner" --exec $DAEMON -- -d --quiet
   log_end_msg $?
   ;;
   stop)
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index d243df8..2c120f5 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -123,7 +123,7 @@ case "$1" in
   fi
   if [ -z "$RUN_SUPERVISED" ] ; then
     log_daemon_msg "Starting $DESC" "$BASENAME"
-    su "$User" -p -s /bin/sh -c ". /lib/lsb/init-functions && start_daemon $DAEMON $OPTIONS -p $PIDFILE $SOCKET" > /dev/null
+    start-stop-daemon -c $User --exec $DAEMON
     ret=$?
   else
     log_daemon_msg "Starting $DESC" "$BASENAME (supervised)"

-- 
Debian repository for ClamAV