diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ACKNOWLEDGMENTS | 6 | ||||
| -rw-r--r-- | src/src/exicyclog.src | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS index 3e1e09b29..7baa785f6 100644 --- 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 050e9da81..b4aa018a0 100644 --- 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 |