make the user spamass-milter, and use it by default for multiuser mails

diff --git a/debian/spamass-milter.default b/debian/spamass-milter.default
index 2b633183c0f8d02f7cced5ae9f1c273949b932df..a2c49e07b712db1cffe82bf75c9ee2b74fce8217 100644 (file)
--- a/debian/spamass-milter.default
+++ b/debian/spamass-milter.default
@@ -5,7 +5,7 @@
 
 # Default, use the nobody user as the default user, ignore messages
 # from localhost
-OPTIONS="-u nobody -i 127.0.0.1"
+OPTIONS="-u spamass-milter -i 127.0.0.1"
 
 # Reject emails with spamassassin scores > 15.
 #OPTIONS="-r 15"

diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index e56792351a9c8974faa42d50f91881e22694957b..c982b280da9a4365c81fe2cdc7d9817126a97721 100644 (file)
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -40,7 +40,7 @@ DESC="Sendmail milter plugin for SpamAssassin"
 
 DEFAULT=/etc/default/spamass-milter
 OPTIONS=""
-RUNAS="spamassmilter"
+RUNAS="spamass-milter"
 CHUID=""
 SOCKETMODE="0600"
 SOCKETOWNER="root:root"
@@ -53,7 +53,7 @@ if [ -e /etc/mail/sendmail.cf ] && egrep -q 'X.+S=local:/var/run/sendmail/spamas
     SOCKETOWNER=""
     RUNAS=""
     echo "WARNING: You are using the old location of spamass.sock. Change your input filter to use";
-    echo "/var/run/spamass/spamass.sock so spamass-milter can run as spamassmilter";
+    echo "/var/run/spamass/spamass.sock so spamass-milter can run as spamass-milter";
 fi;
 
 # If /usr/sbin/postfix exists, set up the defaults for a postfix install

diff --git a/debian/spamass-milter.postinst b/debian/spamass-milter.postinst
index 2e2661c0aa1bdb77b8601e0ab4fecc02597ae8e2..5dfa048315d6d18add63cbb03f8dfbda983ae18b 100644 (file)
--- a/debian/spamass-milter.postinst
+++ b/debian/spamass-milter.postinst
@@ -6,8 +6,8 @@ case "$1" in
     configure)
         # Create the spamassmilter user
        if [ -x /usr/sbin/adduser ]; then
-           if ! id -u spamassmilter >/dev/null 2>&1; then
-               adduser --system --no-create-home spamassmilter;
+           if ! id -u spamass-milter >/dev/null 2>&1; then
+               adduser --system --home /var/lib/spamass-milter spamass-milter;
            fi;
        fi;
        # Attempt to remove /var/run/spamass if it exists