fix socket ownership and permissions again to allow Postfix to talk to this MILTER

milter-dk/milter-dk.spec

@@ -102,8 +102,8 @@ AutoReqProv:  no
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/fsl/*' \
-        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/milter-dk/*' \
-        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/milter-dk'
+        '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/milter-dk/*' \
+        '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/milter-dk'
 
 %files -f files
 

milter-dk/rc.milter-dk

@@ -22,7 +22,7 @@
         [ -f $milter_dk_pidfile ] && kill -$1 `cat $milter_dk_pidfile`
     }
 
-%status -u @l_rusr@ -o
+%status -u @l_susr@ -o
     milter_dk_usable="unknown"
     milter_dk_active="no"
     rcService milter-dk enable yes && \
@@ -31,18 +31,20 @@
     echo "milter_dk_usable=\"$milter_dk_usable\""
     echo "milter_dk_active=\"$milter_dk_active\""
 
-%start -u @l_rusr@
+%start -u @l_susr@
     rcService milter-dk enable yes || exit 0
     rcService milter-dk active yes && exit 0
     rm -f $milter_dk_socket >/dev/null 2>&2 || true
-    export DK_TMPDIR=$milter_dk_tmpdir
-    @l_prefix@/sbin/dk-filter \
-         -l -u $milter_dk_user \
-         -p local:$milter_dk_socket \
-         -P $milter_dk_pidfile \
-         $milter_dk_flags
+    ( umask 002
+      export DK_TMPDIR="$milter_dk_tmpdir"
+      @l_prefix@/sbin/dk-filter \
+           -l -u $milter_dk_user \
+           -p local:$milter_dk_socket \
+           -P $milter_dk_pidfile \
+           $milter_dk_flags
+    ) || exit $?
 
-%stop -u @l_rusr@
+%stop -u @l_susr@
     rcService milter-dk enable yes || exit 0
     rcService milter-dk active no  && exit 0
     milter_dk_signal TERM
@@ -50,12 +52,12 @@
     rm -f $milter_dk_pidfile >/dev/null 2>&1 || true
     rm -f $milter_dk_socket  >/dev/null 2>&1 || true
 
-%restart -u @l_rusr@
+%restart -u @l_susr@
     rcService milter-dk enable yes || exit 0
     rcService milter-dk active no  && exit 0
     rc milter-dk stop start
 
-%daily -u @l_rusr@
+%daily -u @l_susr@
     rcService milter-dk enable yes || exit 0
     shtool rotate -f \
         -n $milter_dk_numfiles -s $milter_dk_minsize -d \

milter-sid/milter-sid.spec

@@ -102,7 +102,7 @@ AutoReqProv:  no
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/fsl/*' \
-        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/milter-sid'
+        '%attr(755,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/milter-sid'
 
 %files -f files
 

milter-sid/rc.milter-sid

@@ -21,7 +21,7 @@
         [ -f $milter_sid_pidfile ] && kill -$1 `cat $milter_sid_pidfile`
     }
 
-%status -u @l_rusr@ -o
+%status -u @l_susr@ -o
     milter_sid_usable="unknown"
     milter_sid_active="no"
     rcService milter-sid enable yes && \
@@ -30,17 +30,19 @@
     echo "milter_sid_usable=\"$milter_sid_usable\""
     echo "milter_sid_active=\"$milter_sid_active\""
 
-%start -u @l_rusr@
+%start -u @l_susr@
     rcService milter-sid enable yes || exit 0
     rcService milter-sid active yes && exit 0
     rm -f $milter_sid_socket >/dev/null 2>&2 || true
-    @l_prefix@/sbin/sid-filter \
-         -l -u $milter_sid_user \
-         -p local:$milter_sid_socket \
-         -P $milter_sid_pidfile \
-         $milter_sid_flags
+    ( umask 002
+      @l_prefix@/sbin/sid-filter \
+           -l -u $milter_sid_user \
+           -p local:$milter_sid_socket \
+           -P $milter_sid_pidfile \
+           $milter_sid_flags
+    ) || exit $?
 
-%stop -u @l_rusr@
+%stop -u @l_susr@
     rcService milter-sid enable yes || exit 0
     rcService milter-sid active no  && exit 0
     milter_sid_signal TERM
@@ -48,12 +50,12 @@
     rm -f $milter_sid_pidfile >/dev/null 2>&1 || true
     rm -f $milter_sid_socket  >/dev/null 2>&1 || true
 
-%restart -u @l_rusr@
+%restart -u @l_susr@
     rcService milter-sid enable yes || exit 0
     rcService milter-sid active no  && exit 0
     rc milter-sid stop start
 
-%daily -u @l_rusr@
+%daily -u @l_susr@
     rcService milter-sid enable yes || exit 0
     shtool rotate -f \
         -n $milter_sid_numfiles -s $milter_sid_minsize -d \