summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Breyha <wbreyha@gmx.net>2014-08-08 13:04:06 -0700
committerTodd Lyons <tlyons@exim.org>2014-08-08 13:04:06 -0700
commitbad059db9d0052aae68ced3cd562319b0e11ace3 (patch)
tree4147613e77a0b95c935c359e25199ea3e9496c40
parenta4b62fcfa0fc6c06d453ffbe0a6fb43788d41fa1 (diff)
downloadexim4-bad059db9d0052aae68ced3cd562319b0e11ace3.tar.gz
Bug 1509: Add parser for DSN spool linesexim-4_84_RC2
DSN support added a new formatted entry to the spool files, this change gives exipick the ability to read that entry.
-rw-r--r--src/src/exipick.src6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/src/exipick.src b/src/src/exipick.src
index ed3b66154..4708ebb4a 100644
--- a/src/src/exipick.src
+++ b/src/src/exipick.src
@@ -1020,6 +1020,12 @@ sub _parse_header {
return($self->_error("incorrect format: $_")) if (length($2) != $3);
$self->{_recips}{$1} = { pno => $4, errors_to => $2 };
$addr = $1;
+ } elsif (/^(\S*)\s(\S*)\s(\d+),(\d+)\s(\S*)\s(\d+),(-?\d+)#3$/) {
+ #print STDERR "exim4 new type #3 DSN (untested): $_\n";
+ return($self->_error("incorrect format: $_"))
+ if ((length($2) != $3) || (length($5) != $6));
+ $self->{_recips}{$1} = { pno => $7, errors_to => $5 };
+ $addr = $1;
} elsif (/^.*#(\d+)$/) {
#print STDERR "exim4 #$1 style (unimplemented): $_\n";
$self->_error("exim4 #$1 style (unimplemented): $_");