From a9df5349e764b2f785022625c1e729dc7de4782a Mon Sep 17 00:00:00 2001
From: don <don@8f7917da-ec0b-0410-a553-b9b0e350d17e>
Date: Fri, 13 Oct 2006 07:20:56 +0000
Subject: [PATCH]   * Use dirname instead of basename (closes: #391909)   *
 Provide example of postfix socket location, and add runas option to    
 change the user that spamassmilter runs as. (closes: #391789)

---
 debian/changelog              |  8 ++++++++
 debian/spamass-milter.default |  4 ++++
 debian/spamass-milter.init    | 12 +++++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 993b8f2..8e7fe6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spamass-milter (0.3.1-3) unstable; urgency=low
+
+  * Use dirname instead of basename (closes: #391909)
+  * Provide example of postfix socket location, and add runas option to
+    change the user that spamassmilter runs as. (closes: #391789)
+
+ -- Don Armstrong <don@debian.org>  Fri, 13 Oct 2006 00:20:32 -0700
+
 spamass-milter (0.3.1-2) unstable; urgency=low
 
   * Create /var/run/sendmail if it doesn't already exist to allow for
diff --git a/debian/spamass-milter.default b/debian/spamass-milter.default
index dad5458..c4cd67c 100644
--- a/debian/spamass-milter.default
+++ b/debian/spamass-milter.default
@@ -12,3 +12,7 @@ OPTIONS="-u nobody -i 127.0.0.1"
 
 # Do not modify Subject:, Content-Type: or body.
 #OPTIONS="-m"
+
+# If you are using postfix, you may want to use the following
+# SOCKET="/var/spool/postfix/spamass.sock"
+# RUNAS="postfix"
\ No newline at end of file
diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index 98647d9..037091c 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -39,6 +39,8 @@ DESC="Sendmail milter plugin for SpamAssassin"
 
 DEFAULT=/etc/default/spamass-milter
 OPTIONS=""
+RUNAS=""
+CHUID=""
 
 test -x $DAEMON || exit 0
 
@@ -46,16 +48,20 @@ if [ -r $DEFAULT ]; then
     . $DEFAULT;
 fi;
 
+if [ -n $RUNAS ]; then
+    CHUID="--chuid $RUNAS";
+fi;
+
 set -e
 
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
 
-	if [ ! -d $(basename $SOCKET) ]; then
-	    mkdir -p $(basename $SOCKET);
+	if [ ! -d $(dirname $SOCKET) ]; then
+	    mkdir -p $(dirname $SOCKET);
 	fi;
-	start-stop-daemon --start -p $PIDFILE --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
+	start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
 
 	echo "${DAEMON}"
 	;;
-- 
2.39.2