diff options
| author | Andrew Colin Kissa <andrew@topdog.za.net> | 2014-07-02 07:00:46 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2014-07-02 07:00:46 -0700 |
| commit | 3ae173e7c0fd026a06c8804d38fe2c03d161e402 (patch) | |
| tree | 9f5b9f20710e70f18f051cf93940d8a7a8ce385d | |
| parent | 7e75538e9b2d735ebe7a2832482353861ec4dff0 (diff) | |
Bug 1495: Exiqgrep -C check configfile readability
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/src/exiqgrep.src | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 606c8201f..cafc8fa2d 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -135,6 +135,9 @@ JH/26 Port service names are now accepted for tls_on_connect_ports, to TF/03 Fix udpsend. The ip_connectedsocket() function's socket type support and error reporting did not work properly. +TL/13 Bug 1495: Exiqgrep check if -C config file specified on cli exists + and is readable. Patch from Andrew Colin Kissa. + Exim version 4.82 ----------------- diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src index 94b17f58b..afecbffee 100644 --- a/src/src/exiqgrep.src +++ b/src/src/exiqgrep.src @@ -46,7 +46,7 @@ if ($^O eq 'darwin') { # aka MacOS X 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}; } +if ($opt{C} && -e $opt{C} && -f $opt{C} && -R $opt{C}) { $eargs .= ' -C '.$opt{C}; } # Read message queue output into hash &collect(); |