nm4 2009/01/02 16:58:05 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exiwhat.src
Log:
Fixed behaviour of exiwhat when no config. Fixes: #497
Revision Changes Path
1.560 +3 -1 exim/exim-doc/doc-txt/ChangeLog
1.3 +6 -0 exim/exim-src/src/exiwhat.src
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- ChangeLog 12 Dec 2008 14:51:47 -0000 1.559
+++ ChangeLog 2 Jan 2009 16:58:05 -0000 1.560
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.559 2008/12/12 14:51:47 nm4 Exp $
+$Cambridge: exim/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 @@
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/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
-----------------
Index: exiwhat.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exiwhat.src,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exiwhat.src 21 Apr 2008 13:13:57 -0000 1.2
+++ exiwhat.src 2 Jan 2009 16:58:05 -0000 1.3
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/src/exiwhat.src,v 1.2 2008/04/21 13:13:57 fanf2 Exp $
+# $Cambridge: exim/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 @@
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
