(1) Applied Matthew Newton's exicyclog patch. (2) Another wish.

diff --git a/doc/doc-misc/WishList b/doc/doc-misc/WishList
index cbe95d569bfc6e93f89cb9119779f4f5c06d4abc..adc8b0bba9a41e5ce582df8c59aef2792d22f351 100644 (file)
--- a/doc/doc-misc/WishList
+++ b/doc/doc-misc/WishList
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-misc/WishList,v 1.38 2005/06/14 10:40:41 ph10 Exp $
+$Cambridge: exim/doc/doc-misc/WishList,v 1.39 2005/06/16 15:48:58 ph10 Exp $
 
 EXIM 4 WISH LIST
 ----------------
@@ -1993,5 +1993,15 @@ default configuration file. The relay_from_hosts and authenticated clauses
 would be better off before the dnslists examples. However, this should be left
 until a x.x0 release, because of the documentation implications.
 ------------------------------------------------------------------------------
---- HWM 335 ------------------------------------------------------------------
+
+(336) 16-Jun-05 M Show recipient(s) after header check failure
+
+The mainlog line for "There is no valid sender in any header line" shows the
+sending host and the envelope sender, but does not show any recipients. There
+has been a request to show recipients. Presumably this should be on some new
+log selector, and it must have a cutoff maximum number of recipients. NOTE: the
+data in the reject log does show the envelope recipients as part of its
+additional data.
+------------------------------------------------------------------------------
+--- HWM 336 ------------------------------------------------------------------
 ---------------------------- End of WishList ---------------------------------

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index c377b9394172d72aa7959fc5aef7f42c24fe8114..8f78919c8f7bbc4e57ff759d11ae185dd8d0ff70 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.157 2005/06/16 14:10:13 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.158 2005/06/16 15:48:58 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -127,6 +127,15 @@ PH/15 The code I had for printing potentially long long variables in PH/11
       LONG_LONG_SUPPORT if the length is greater than 4. This is needed for the
       internal formatting function string_vformat().
 
+PH/16 Applied Matthew Newton's patch to exicyclog: "If log_file_path is set in
+      the configuration file to be ":syslog", then the script "guesses" where
+      the logs files are, rather than using the compiled in default. In our
+      case the guess is not the same as the compiled default, so the script
+      suddenly stopped working when I started to use syslog. The patch checks
+      to see if log_file_path is "". If so, it attempts to read it from exim
+      with no configuration file to get the compiled in version, before it
+      falls back to the previous guessing code."
+
 
 Exim version 4.51
 -----------------

diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 3e1e09b293491a0ffc1428cfd7d73307d30eb5b0..7baa785f68dabedecd7d514d435fedf4ecd6966d 100644 (file)
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.26 2005/06/14 10:32:01 ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.27 2005/06/16 15:48:58 ph10 Exp $
 
 EXIM ACKNOWLEDGEMENTS
 
@@ -20,7 +20,7 @@ relatively small patches.
 Philip Hazel
 
 Lists created: 20 November 2002
-Last updated:  14 June 2005
+Last updated:  16 June 2005
 
 
 THE OLD LIST
@@ -128,6 +128,7 @@ Tony Finch                Expansion extensions
                             Patch for defer_foo in dndsb
                             Patch for ${dlfunc
                             Patch for $message_linecount
+                            ... and many more
 Ian Freislich             Patch for spamd timeout problem
 Giuliano Gavazzi          Patches for OSX compilation
 Dominic Germain           Patch for exiqgrep MacOS X bug
@@ -189,6 +190,7 @@ Alex Miller               Suggested readline() patch
                           Support for the DrWeb content scanner
 Andreas Mueller           Patch for logging uncompleted SMTP transactions
 Pete Naylor               Patch for LDAP TCP connect timeout setting
+Matthew Newton            Patch for exicyclog log location problem
 Marcin Owsiany            Diagnosis of a tricky timeout failure bug
 Eric Parusel              Patch for tls_remember_esmtp
 Gaige Paulsen             Amended Darwin config files

diff --git a/src/src/exicyclog.src b/src/src/exicyclog.src
index 050e9da81be95617b93da731b8331f71a61b447c..b4aa018a06e1a4084043f6784e9b6244a968fb22 100644 (file)
--- a/src/src/exicyclog.src
+++ b/src/src/exicyclog.src
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exicyclog.src,v 1.3 2005/02/17 11:58:26 ph10 Exp $
+# $Cambridge: exim/src/src/exicyclog.src,v 1.4 2005/06/16 15:48:58 ph10 Exp $
 
 # Copyright (c) 2004 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.
@@ -139,10 +139,19 @@ fi
 log_file_path=`echo "$log_file_path" | \
   sed 's/^ *:\{0,1\} *syslog *:\{0,1\} *//;s/: *syslog *:/:/;s/: *syslog *$//'`
 
-# If log_file_path is empty, then the logs we are interested in are called
-# "mainlog" and "rejectlog" in the directory called "log" in the spool
-# directory. Otherwise we fish out the directory from the given path, and
-# also the names of the logs.
+# If log_file_path is empty, try and get the compiled in default by using
+# /dev/null as the configuration file.
+
+if [ "$log_file_path" = "" ]; then
+  log_file_path=`$exim_path -C /dev/null -bP log_file_path | sed 's/.*=[  ]*//'`
+  log_file_path=`echo "$log_file_path" | \
+    sed 's/^ *:\{0,1\} *syslog *:\{0,1\} *//;s/: *syslog *:/:/;s/: *syslog *$//'`
+fi
+
+# If log_file_path is still empty, the logs we are interested in are probably
+# called "mainlog" and "rejectlog" in the directory called "log" in the spool
+# directory. Otherwise we fish out the directory from the given path, and also
+# the names of the logs.
 
 if [ "$log_file_path" = "" ]; then
   logdir=$spool_directory/log