Attachment 197226 Details for Bug 223038 – mail/opendkim-2.10.3_9 rc script

[patch] mail/opendkim-2.10.3_9 rc script

opendkim-2.10.3_9.diff (text/plain), 2.09 KB, created by Matthias Pfaller on 2018-09-19 06:23:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Pfaller

Created: 2018-09-19 06:23:54 UTC

Size: 2.09 KB

patch

obsolete

>--- milter-opendkim.in.orig	2017-08-18 22:49:16.000000000 +0200
>+++ milter-opendkim.in	2018-09-19 08:22:15.105154000 +0200
>@@ -156,10 +156,12 @@
> 
> dkim_prepcmd ()
> {
>-    if [ -S ${milteropendkim_socket##local:} ] ; then
>-        rm -f ${milteropendkim_socket##local:}
>-    elif [ -S ${milteropendkim_socket##unix:} ] ; then
>-        rm -f ${milteropendkim_socket##unix:}
>+    if [ "x${milteropendkim_socket}" != "x" ] ; then
>+        if [ -S ${milteropendkim_socket##local:} ] ; then
>+            rm -f ${milteropendkim_socket##local:}
>+        elif [ -S ${milteropendkim_socket##unix:} ] ; then
>+            rm -f ${milteropendkim_socket##unix:}
>+        fi
>     fi
>     if [ ! -d ${_piddir} ] ; then
> 	mkdir -p ${_piddir}
>@@ -176,21 +178,25 @@
> 
> dkim_start_postcmd ()
> {
>-    # postcmd is executed too fast and socket is not created before checking...
>-    sleep 1
>-    if [ -S ${milteropendkim_socket##local:} ] ; then
>-        chmod ${_piddir_perms} ${milteropendkim_socket##local:}
>-    elif [ -S ${milteropendkim_socket##unix:} ] ; then
>-        chmod ${_piddir_perms} ${milteropendkim_socket##unix:}
>+    if [ "x${milteropendkim_socket}" != "x" ] ; then
>+        # postcmd is executed too fast and socket is not created before checking...
>+        sleep 1
>+        if [ -S ${milteropendkim_socket##local:} ] ; then
>+            chmod ${_piddir_perms} ${milteropendkim_socket##local:}
>+        elif [ -S ${milteropendkim_socket##unix:} ] ; then
>+            chmod ${_piddir_perms} ${milteropendkim_socket##unix:}
>+        fi
>     fi
> }
> 
> dkim_postcmd()
> {
>-    if [ -S ${milteropendkim_socket##local:} ] ; then
>-        rm -f ${milteropendkim_socket##local:}
>-    elif [ -S ${milteropendkim_socket##unix:} ] ; then
>-        rm -f ${milteropendkim_socket##unix:}
>+    if [ "x${milteropendkim_socket}" != "x" ] ; then
>+        if [ -S ${milteropendkim_socket##local:} ] ; then
>+            rm -f ${milteropendkim_socket##local:}
>+        elif [ -S ${milteropendkim_socket##unix:} ] ; then
>+            rm -f ${milteropendkim_socket##unix:}
>+        fi
>     fi
>     # just if the directory is empty
>     rmdir ${_piddir} > /dev/null 2>&1

Actions: View | Diff

Attachments on bug 223038: 187204 | 187746 | 197226