ph10 2005/06/16 16:48:58 BST
Modified files:
exim-doc/doc-misc WishList
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src exicyclog.src
Log:
(1) Applied Matthew Newton's exicyclog patch. (2) Another wish.
Revision Changes Path
1.39 +11 -1 exim/exim-doc/doc-misc/WishList
1.158 +9 -0 exim/exim-doc/doc-txt/ChangeLog
1.27 +3 -1 exim/exim-src/ACKNOWLEDGMENTS
1.4 +13 -4 exim/exim-src/src/exicyclog.src
Index: WishList
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-misc/WishList,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- WishList 14 Jun 2005 10:40:41 -0000 1.38
+++ WishList 16 Jun 2005 15:48:58 -0000 1.39
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.38 2005/06/14 10:40:41 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-misc/WishList,v 1.39 2005/06/16 15:48:58 ph10 Exp $
EXIM 4 WISH LIST
----------------
@@ -1993,5 +1993,15 @@
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 ---------------------------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- ChangeLog 16 Jun 2005 14:10:13 -0000 1.157
+++ ChangeLog 16 Jun 2005 15:48:58 -0000 1.158
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.157 2005/06/16 14:10:13 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -126,6 +126,15 @@
or %lld) is chosen and #defined by OFF_T_FMT. We also define ASSUME_
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
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ACKNOWLEDGMENTS 14 Jun 2005 10:32:01 -0000 1.26
+++ ACKNOWLEDGMENTS 16 Jun 2005 15:48:58 -0000 1.27
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.26 2005/06/14 10:32:01 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.27 2005/06/16 15:48:58 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 14 June 2005
+Last updated: 16 June 2005
THE OLD LIST
@@ -128,6 +128,7 @@
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 @@
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
Index: exicyclog.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exicyclog.src,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exicyclog.src 17 Feb 2005 11:58:26 -0000 1.3
+++ exicyclog.src 16 Jun 2005 15:48:58 -0000 1.4
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/src/exicyclog.src,v 1.3 2005/02/17 11:58:26 ph10 Exp $
+# $Cambridge: exim/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 @@
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
