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

diff --git a/debian/changelog b/debian/changelog
index 2f2b562e3d1b989986d3d3de78838f0682297dd2..8c26a259a5b96fec7c35a2ec2e48f8f140661cea 100644 (file)
--- 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 afa63ca6774c764ecaf2b7bb391461a4f55c92ba..ef5696276b755550b6f7b16cbd83a02014167496 100644 (file)
--- 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
 }