From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 11 May 2018 04:16:58 +0000 (-0700)
Subject: don't bother to rm/chmod/chown inet sockets
X-Git-Tag: debian/0.4.0-2~7
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fspamass-milter.git;a=commitdiff_plain;h=bef116225aaf81fc42373a387d73e78eb5b6c3fb

don't bother to rm/chmod/chown inet sockets
---

diff --git a/debian/changelog b/debian/changelog
index 2f2b562..8c26a25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ spamass-milter (0.4.0-2) unstable; urgency=medium
   * Create a home directory for the spamass-milter user, because we use it
     as the default for spamassassin (Closes: #696861)
   * Remove the pointless s suffix in spamass-milter.init (closes: #772368)
+  * Don't bother to remove inet sockets or try to chown/chmod them.
+    (closes: #767966)
 
  -- Don Armstrong <don@debian.org>  Thu, 10 May 2018 12:13:11 -0700
 
diff --git a/debian/spamass-milter.init b/debian/spamass-milter.init
index afa63ca..ef56962 100644
--- a/debian/spamass-milter.init
+++ b/debian/spamass-milter.init
@@ -125,18 +125,22 @@ start() {
     fi;
     start-stop-daemon --start -p $PIDFILE $CHUID --exec $DAEMON -- -P $PIDFILE -f -p $SOCKET $OPTIONS
     sleep 1
-    if [ -n "$SOCKETMODE" ]; then
-	chmod $SOCKETMODE $SOCKET;
-    fi;
-    if [ -n "$SOCKETOWNER" ]; then
-	chown $SOCKETOWNER $SOCKET;
+    if [ $(dirname $SOCKET) != "." ];
+       if [ -n "$SOCKETMODE" ]; then
+	       chmod $SOCKETMODE $SOCKET;
+       fi;
+       if [ -n "$SOCKETOWNER" ]; then
+	       chown $SOCKETOWNER $SOCKET;
+       fi;
     fi;
 }
 
 stop(){
     start-stop-daemon --oknodo --stop -p $PIDFILE --signal 3 --exec $DAEMON
     /bin/sleep 5
-    /bin/rm -f $SOCKET
+    if [ $(dirname $SOCKET) != "." ]; then 
+	    /bin/rm -f $SOCKET
+    fi;
     /bin/rm -f $PIDFILE
 }