- compensate for 20020517 not being able to change uid

Changed files:
    amavisd-new-config.patch -> 1.3
    amavisd-new.init -> 1.3

diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch
index 26297491fc79aae69ca01030d70c1998056c2968..664e982244ed16209827d5e131180af37e6e6cc6 100644 (file)
--- a/amavisd-new-config.patch
+++ b/amavisd-new-config.patch
@@ -22,7 +22,7 @@
 -$pid_file = '/var/amavis/amavisd.pid';
 +$daemon_group = 'nobody';
 +#$daemon_group = 'sweep';
-+$pid_file = '/var/run/amavisd.pid';
++$pid_file = '/var/run/amavisd/amavisd.pid';
  
  #
  # Part III - Virus stuff

diff --git a/amavisd-new.init b/amavisd-new.init
index 3216d15d2588722520e9969891029d4c82766dbb..075f91ce658bb358a3ba70c0f5fb90d8259f1e68 100644 (file)
--- a/amavisd-new.init
+++ b/amavisd-new.init
@@ -24,7 +24,7 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/amavisd ]; then
                msg_starting Amavisd
-               daemon $SERVICE_RUN_NICE_LEVEL /usr/sbin/amavisd
+               daemon $SERVICE_RUN_NICE_LEVEL 'su -s /bin/sh amavis -c /usr/sbin/amavisd'
                touch /var/lock/subsys/amavisd
        else
                msg_Already_Running Amavisd