From: Wolfgang Breyha <wbreyha@gmx.net>
Date: Fri, 8 Aug 2014 20:04:06 +0000 (-0700)
Subject: Bug 1509: Add parser for DSN spool lines
X-Git-Tag: exim-4_84_RC2^0
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/bad059db9d0052aae68ced3cd562319b0e11ace3

Bug 1509: Add parser for DSN spool lines

DSN support added a new formatted entry to the spool files, this change
  gives exipick the ability to read that entry.
---

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): $_");