summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-07-30 23:09:04 +0000
committerfukachan <fukachan>2001-07-30 23:09:04 +0000
commit8f9bfa0bc419cb09e9b64562c8866884e7746b27 (patch)
treee30002675d4611b12eb2443f9951a4c33fc4a3d0
parentb1db93cc5471ce24b0ec1153a2d407ffd35e87a0 (diff)
downloadfml8-8f9bfa0bc419cb09e9b64562c8866884e7746b27.tar.gz
fml8-8f9bfa0bc419cb09e9b64562c8866884e7746b27.tar.bz2
fml8-8f9bfa0bc419cb09e9b64562c8866884e7746b27.zip
pick up Reporting-MTA and Received-From-MTA in DSN
-rw-r--r--fml/lib/Mail/Bounce.pm11
-rw-r--r--fml/lib/Mail/Bounce/DSN.pm11
2 files changed, 12 insertions, 10 deletions
diff --git a/fml/lib/Mail/Bounce.pm b/fml/lib/Mail/Bounce.pm
index 09e06ca0..5dc7f2da 100644
--- a/fml/lib/Mail/Bounce.pm
+++ b/fml/lib/Mail/Bounce.pm
@@ -4,7 +4,7 @@
# All rights reserved. This program is free software; you can
# redistribute it and/or modify it under the same terms as Perl itself.
#
-# $FML: Bounce.pm,v 1.10 2001/07/29 15:08:36 fukachan Exp $
+# $FML: Bounce.pm,v 1.11 2001/07/30 14:42:33 fukachan Exp $
#
package Mail::Bounce;
@@ -69,16 +69,13 @@ returned C<$result> provides the following information:
Diagnostic-Code => 'reason ...',
Action => 'failed',
Status => '4.0.0',
+ Reporting-MTA => 'dns; server.fml.org',
+ Received-From-MTA => 'DNS; server.fml.org',
hints => ... which module matches ...,
},
address2 => {
- Original-Recipient => 'rfc822; addr',
- Final-Recipient => 'rfc822; addr',
- Diagnostic-Code => 'reason ...',
- Action => 'failed',
- Status => '4.0.0',
- hints => ... which module matches ...,
+ ... snip ...
},
...
diff --git a/fml/lib/Mail/Bounce/DSN.pm b/fml/lib/Mail/Bounce/DSN.pm
index dc30464c..b9ff7168 100644
--- a/fml/lib/Mail/Bounce/DSN.pm
+++ b/fml/lib/Mail/Bounce/DSN.pm
@@ -4,7 +4,7 @@
# All rights reserved. This program is free software; you can
# redistribute it and/or modify it under the same terms as Perl itself.
#
-# $FML: DSN.pm,v 1.6 2001/04/12 14:07:40 fukachan Exp $
+# $FML: DSN.pm,v 1.7 2001/07/30 14:42:34 fukachan Exp $
#
@@ -125,8 +125,13 @@ sub _parse_dsn_format
# set up return buffer
if ($addr =~ /\@/) {
$result->{ $addr }->{ 'Final-Recipient' } = $addr;
- for ('Final-Recipient', 'Original-Recipient',
- 'Action', 'Status', 'Diagnostic-Code') {
+ for ('Final-Recipient',
+ 'Original-Recipient',
+ 'Action',
+ 'Status',
+ 'Diagnostic-Code',
+ 'Reporting-MTA',
+ 'Received-From-MTA') {
$result->{ $addr }->{ $_ } = $header->get($_) || undef;
}
$result->{ $addr }->{ 'hints' } = 'DSN';