Correct exiwhat mishandling log_selector = +pid. Fixes: #688

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ddf4f5542ff64daff5f3cd36d67828fb1ecbf2f2..295e917237eacc2beba0a69835c45824a2b00e8a 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.574 2009/10/19 11:41:27 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.575 2009/10/19 11:47:43 nm4 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -120,6 +120,9 @@ NM/22 Bugzilla 607: prepend (not append) Resent-Message-ID and Resent-Date
 NM/23 Bugzilla 687: Fix misparses in eximstats
       Patch provided by Heiko Schlittermann
 
 NM/23 Bugzilla 687: Fix misparses in eximstats
       Patch provided by Heiko Schlittermann
 

+NM/24 Bugzilla 688: Fix exiwhat to handle log_selector = +pid
+      Patch provided by Heiko Schlittermann
+

 
 Exim version 4.69
 -----------------
 
 Exim version 4.69
 -----------------

diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index c5bb312bb61bf148b9aec409eb047047887207c4..3af128cf49c54a6cd391b6486644133aeb4d88f2 100644 (file)
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# $Cambridge: exim/src/src/exiwhat.src,v 1.3 2009/01/02 16:58:05 nm4 Exp $
+# $Cambridge: exim/src/src/exiwhat.src,v 1.4 2009/10/19 11:47:44 nm4 Exp $

 
 # Copyright (c) 2003 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.
 
 # Copyright (c) 2003 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.


@@ -130,7 +130,7 @@ fi
 sleep 1
 
 if [ ! -s ${log} ] ; then echo "No exim process data" ;
 sleep 1
 
 if [ ! -s ${log} ] ; then echo "No exim process data" ;

-  else sed 's/^[0-9-]* [0-9:]* \([+-][0-9]* \)*//' ${log} | sort -n | uniq ; fi
+  else sed 's/^[0-9-]* [0-9:]* \([+-][0-9]* \)*\(\[[0-9]\+\] \)\?//' ${log} | sort -n | uniq ; fi

 
 
 # End of exiwhat
 
 
 # End of exiwhat