From: Tony Finch <dot@dot.at>
Date: Mon, 21 Apr 2008 13:13:57 +0000 (+0000)
Subject: Check that $multikill_cmd exists before running it, in case
X-Git-Tag: DEVEL_PDKIM_START~43
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/079cc20f36c728c7090dd9c70cc415c5f5dabacd

Check that $multikill_cmd exists before running it, in case
exiwhat is configured with a command name that is generally
correct but happens not to be installed on the system.
Fixes: bug #701
---

diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index 77d7f16b9..4905aa44c 100644
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exiwhat.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
+# $Cambridge: exim/src/src/exiwhat.src,v 1.2 2008/04/21 13:13:57 fanf2 Exp $
 
 # Copyright (c) 2003 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.
@@ -109,7 +109,7 @@ fi
 # Solaris, "killall" kills ALL processes - this is the System V version of this
 # command, and not what we want!
 
-if [ "$multikill_cmd" != "" ] ; then
+if [ "$multikill_cmd" != "" ] && type "$multikill_cmd" >/dev/null 2>&1; then
   $multikill_cmd $signal "$multikill_arg"
 
 # No multikill command; do it the hard way