nm4 2009/10/19 12:47:44 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exiwhat.src
Log:
Correct exiwhat mishandling log_selector = +pid. Fixes: #688
Revision Changes Path
1.575 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.4 +1 -1 exim/exim-src/src/exiwhat.src
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- ChangeLog 19 Oct 2009 11:41:27 -0000 1.574
+++ ChangeLog 19 Oct 2009 11:47:43 -0000 1.575
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.574 2009/10/19 11:41:27 nm4 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -120,6 +120,9 @@
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
-----------------
Index: exiwhat.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exiwhat.src,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exiwhat.src 2 Jan 2009 16:58:05 -0000 1.3
+++ exiwhat.src 19 Oct 2009 11:47:44 -0000 1.4
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/src/exiwhat.src,v 1.3 2009/01/02 16:58:05 nm4 Exp $
+# $Cambridge: exim/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.
@@ -130,7 +130,7 @@
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
