Attachment 451548 Details for Bug 706257

[patch] Patch for /etc/init.d/amavis

amavis.patch (text/plain), 1.76 KB, created by Freek de Kruijf on 2011-09-17 22:33:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Freek de Kruijf

Created: 2011-09-17 22:33:46 UTC

Size: 1.76 KB

patch

obsolete

>--- /etc/init.d/amavis	2011-02-22 11:42:06.000000000 +0100
>+++ /suse121/etc/init.d//amavis	2011-09-18 00:15:36.478269215 +0200
>@@ -60,8 +60,8 @@
>     start)
> 	# ZMI 20100428 check for stale pid file
> 	if test -f $AMAVIS_PID ; then
>-		checkproc -p $AMAVIS_PID amavisd
>-		if test $? -ge 1 ; then
>+		checkproc -p $AMAVIS_PID $AMAVISD_BIN
>+		if test $? -le 0 ; then
> 			# pid file is stale, remove it
> 			echo -n "(stale amavisd pid file $AMAVIS_PID found, removing. Did amavisd crash?)"
> 			rm -f $AMAVIS_PID
>@@ -69,7 +69,7 @@
> 	fi
>         echo -n "Starting virus-scanner (amavisd-new): "
>         $AMAVISD_BIN start
>-        if ! checkproc amavisd; then
>+        if checkproc $AMAVISD_BIN; then
>             rc_failed 7
>         fi
>         rc_status -v
>@@ -82,7 +82,7 @@
> 	;;
>     stop)
>         echo -n "Shutting down virus-scanner (amavisd-new): "
>-        if checkproc amavisd; then
>+        if ! checkproc $AMAVISD_BIN; then
>             rc_reset
>             $AMAVISD_BIN stop
>         else
>@@ -117,13 +117,17 @@
>     ;;                            	
>     status)
>         echo -n "Checking for service amavis (amavisd-new): "
>-        checkproc -p $AMAVIS_PID amavisd
>-        rc_status -v
>-        if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
>-            rc_reset
>-            echo -n "Checking for service amavis-milter: "
>-            checkproc $AMAVIS_MILTER_BIN
>+        checkproc -p $AMAVIS_PID $AMAVISD_BIN
>+        if [ "$?" == "1" ] ; then
>             rc_status -v
>+            if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
>+                rc_reset
>+                echo -n "Checking for service amavis-milter: "
>+                checkproc $AMAVIS_MILTER_BIN
>+                rc_status -v
>+            fi
>+        else
>+            rc_status -u
>         fi
>     ;;
>     probe)

Actions: View | Diff

Attachments on bug 706257: 451548 | 463034