ph10 2005/12/22 11:47:24 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exinext.src
Log:
Fix incomplete -C test facility in exinext.
Revision Changes Path
1.281 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.2 +4 -2 exim/exim-src/src/exinext.src
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- ChangeLog 19 Dec 2005 12:25:21 -0000 1.280
+++ ChangeLog 22 Dec 2005 11:47:24 -0000 1.281
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.280 2005/12/19 12:25:21 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.281 2005/12/22 11:47:24 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -59,6 +59,10 @@
name, causing unrelated and misleading errors. What now happens is that
it logs this as a hard delivery error, but does not attempt to create a
bounce message.
+
+PH/11 The exinext utility has a -C option for testing purposes, but although
+ the given file was scanned by exinext itself; it wasn't being passed on
+ when Exim was called.
Exim version 4.60
Index: exinext.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exinext.src,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exinext.src 7 Oct 2004 10:39:01 -0000 1.1
+++ exinext.src 22 Dec 2005 11:47:24 -0000 1.2
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/src/exinext.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
+# $Cambridge: exim/exim-src/src/exinext.src,v 1.2 2005/12/22 11:47:24 ph10 Exp $
# Copyright (c) 1996-2004 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.
@@ -107,13 +107,14 @@
# pick up routing delays after temporary recipient errors.
# Also add unqualified subject if it looks like a message id.
# 01-Apr-2004 Add the -C feature for testing
+# 22-Dec-2005 Complete the -C feature (!)
if [ "$argone" = "" ]; then
echo "Usage: exinext <address>|<domain>|<local-part>"
exit 1
fi
-perl - $exim_path "$eximmacdef" $argone $spool_directory $qualify_domain <<'End'
+perl - $exim_path "$eximmacdef" $argone $spool_directory $qualify_domain $config <<'End'
# Name the arguments
@@ -122,6 +123,7 @@
$subject = $ARGV[2];
$spool = $ARGV[3];
$qualify = $ARGV[4];
+ $config = $ARGV[5];
# If the subject doesn't contain an @ then construct an address
# for the domain, and ensure that in both cases the domain is
@@ -133,7 +135,7 @@
# Run Exim to get a list of hosts for the given domain; for
# each one construct the appropriate retry key.
- open(LIST, "$exim -v -bt $address |") ||
+ open(LIST, "$exim -C $config -v -bt $address |") ||
die "can't run exim to route $address";
while (<LIST>)
