summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Metheringham <nigel@exim.org>2009-01-02 16:58:05 +0000
committerNigel Metheringham <nigel@exim.org>2009-01-02 16:58:05 +0000
commit447de4b05520fb2c652ddb8958ba149da32102e2 (patch)
tree960dc565e8ef4a2ae69dd864579b1b2f60e06380
parent3ac82526e93764d2e67838d4b3a0e7ee83b1aad7 (diff)
Fixed behaviour of exiwhat when no config. Fixes: #497
-rw-r--r--doc/doc-txt/ChangeLog6
-rw-r--r--src/src/exiwhat.src8
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dd9352965..804544f58 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.559 2008/12/12 14:51:47 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.560 2009/01/02 16:58:05 nm4 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -75,7 +75,7 @@ NM/07 Bugzilla 769: Extraneous comma in usage fprintf
Patch provided by Richard Godbee
NM/08 Fixed erroneous documentation references to smtp_notquit_acl to be
- acl_smtp_notquit
+ acl_smtp_notquit, added index entry.
NM/09 Bugzilla 787: Potential buffer overflow in string_format
Patch provided by Eugene Bujak
@@ -86,6 +86,8 @@ NM/10 Bugzilla 770: Problem on some platforms modifying the len parameter to acc
NM/11 Bugzilla 749: Preserve old behaviour of blanks comparing equal to zero.
Patch provided by Phil Pennock
+NM/12 Bugzilla 497: Correct behaviour of exiwhat when no config exists.
+
Exim version 4.69
-----------------
diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index 4905aa44c..c5bb312bb 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.2 2008/04/21 13:13:57 fanf2 Exp $
+# $Cambridge: exim/src/src/exiwhat.src,v 1.3 2009/01/02 16:58:05 nm4 Exp $
# Copyright (c) 2003 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.
@@ -75,6 +75,12 @@ while [ "$config" = "" -a $# -gt 0 ] ; do
shift
done
+# check we have a config file
+if [ "$config" = "" -o ! -f "$config" ]; then
+ echo Config file not found.
+ exit 1
+fi
+
# Determine where the spool directory is. Search for an exim_path setting
# in the configure file; otherwise use the bin directory. Call that version of
# Exim to find the spool directory. BEWARE: a tab character is needed in the