From 8d91c6dcd2c16f9a84b7abf47d130bac1a8bb273 Mon Sep 17 00:00:00 2001
From: Lars Timmann <lt@mcs.de>
Date: Wed, 23 Apr 2014 17:03:06 -0700
Subject: [PATCH] Bug 609: Add -C option to exiqgrep

Option is a passthrough to the exim process that it spawns that
  generates the queue list.

Fixed Conflicts:
	doc/doc-txt/ChangeLog
---
 doc/doc-docbook/spec.xfpt | 6 +++++-
 doc/doc-txt/ChangeLog     | 3 +++
 doc/doc-txt/NewStuff      | 3 +++
 src/src/exiqgrep.src      | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 612d147a5..72823028d 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -34683,7 +34683,11 @@ exim -bpu
 or (in case &*-a*& switch is specified)
 .code
 exim -bp
-.endd 
+.endd
+.new
+The &*-C*& option is used to specify an alternate &_exim.conf_& which might
+contain alternate exim configuration the queue management might be using.
+.wen
 
 to obtain a queue listing, and then greps the output to select messages 
 that match given criteria. The following selection options are available:
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 649b730f0..8bf42d537 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -93,6 +93,9 @@ TL/08 Bugzilla 1453: New LDAP "SERVERS=" option allows admin to override list
 
 JH/18 New options dnssec_lax, dnssec_strict on dnsdb lookups.
 
+TL/09 Bugzilla 609: Add -C option to exiqgrep, specify which exim.conf to use.
+      Patch submitted by Lars Timman.
+
 
 Exim version 4.82
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index bfbfc7150..39e2aa4d9 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -36,6 +36,9 @@ Version 4.83
     lookup can now set a list of servers to use that is different from the
     default list.
 
+ 7. New command-line option -C for exiqgrep to specify alternate exim.conf
+    file when searching the queue.
+
 
 Version 4.82
 ------------
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index 05c1b9ed0..94b17f58b 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -43,9 +43,10 @@ if ($^O eq 'darwin') { # aka MacOS X
   $base = 62;
 };
 
-getopts('hf:r:y:o:s:zxlibRca',\%opt);
+getopts('hf:r:y:o:s:C:zxlibRca',\%opt);
 if ($opt{h}) { &help; exit;}
 if ($opt{a}) { $eargs = '-bp'; }
+if ($opt{C}) { $eargs .= ' -C '.$opt{C}; }
 
 # Read message queue output into hash
 &collect();
@@ -61,6 +62,7 @@ sub help() {
 Exim message queue display utility.
 
 	-h		This help message.
+	-C		Specify which exim.conf to use.
 
 Selection criteria:
 	-f <regexp>	Match sender address sender (field is "< >" wrapped)
-- 
2.25.1