diff options
| author | fukachan <fukachan> | 2001-04-15 12:30:26 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2001-04-15 12:30:26 +0000 |
| commit | 38f5a55c4a9ad1528fefa9983e2ea7225ca2c7b3 (patch) | |
| tree | ae3989f2faad41a6a07d9902b85782d2036b34f9 | |
| parent | e22d192f14fce4e90872333f6132b104833173ad (diff) | |
| download | fml8-38f5a55c4a9ad1528fefa9983e2ea7225ca2c7b3.tar.gz fml8-38f5a55c4a9ad1528fefa9983e2ea7225ca2c7b3.tar.bz2 fml8-38f5a55c4a9ad1528fefa9983e2ea7225ca2c7b3.zip | |
add sample and trap rules for SMTP32
| -rw-r--r-- | fml/lib/Mail/Bounce/SimpleMatch.pm | 16 | ||||
| -rw-r--r-- | regress/errormails/smtp32 | 35 |
2 files changed, 44 insertions, 7 deletions
diff --git a/fml/lib/Mail/Bounce/SimpleMatch.pm b/fml/lib/Mail/Bounce/SimpleMatch.pm index d6d45e6a..762e5309 100644 --- a/fml/lib/Mail/Bounce/SimpleMatch.pm +++ b/fml/lib/Mail/Bounce/SimpleMatch.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: SimpleMatch.pm,v 1.11 2001/04/12 14:41:44 fukachan Exp $ +# $FML: SimpleMatch.pm,v 1.12 2001/04/12 16:41:22 fukachan Exp $ # @@ -101,10 +101,10 @@ my $address_trap_regexp = { # XXX what is this ??? - # 'smtp32' => { - # 'start' => '.', - # 'end' => 'original message follows', - # }, + 'smtp32' => { + 'start' => 'undeliverable to', + 'end' => 'original message follows', + }, }; my $reason_trap_regexp = { @@ -171,7 +171,9 @@ sub _reach_end 0; } - +# XXX +# XXX our state check is applied to each paragraph not the whole body. +# XXX sub _address_match { my ($self, $args) = @_; @@ -182,7 +184,7 @@ sub _address_match for my $mta_type (keys %$address_trap_regexp) { next unless $mta_type; - my $start_regexp = $address_trap_regexp->{ $mta_type }->{ 'start' }; + my $start_regexp = $address_trap_regexp->{ $mta_type }->{'start'}; if ($$rbuf =~ /$start_regexp/) { $args->{ mta_type } = $mta_type; $args->{ state } = 1; diff --git a/regress/errormails/smtp32 b/regress/errormails/smtp32 new file mode 100644 index 00000000..593aa033 --- /dev/null +++ b/regress/errormails/smtp32 @@ -0,0 +1,35 @@ +Return-Path: <> +Received: from iv.nuinui.net (ivex-sv.iv.nuinui.net [10.20.30.2]) + by go.nuinui.net (Postfix) with ESMTP id B089F46 + for <*********@error.fml.org>; Fri, 6 Apr 2001 19:47:43 +0900 (JST) +Date: Fri, 6 Apr 2001 19:47:11 +0900 +Message-Id: <101********.*******@iv.nuinui.net> +From: "Postmaster" <postmaster@iv.nuinui.net> +Sender: <postmaster@iv.nuinui.net> +To: <*********@error.fml.org> +Subject: Undeliverable Mail +X-Mailer: <SMTP32 v20000614> + +undeliverable to *******@docomo.ne.jp + + +Original message follows. + +Received: from SMTP32-FWD by iv.nuinui.net + (SMTP32) id A0000010B; Fri, 6 Apr 2001 19:47:10 +0900 +Received: from go.nuinui.net [10.20.30.20] by iv.nuinui.net + (SMTPD32-6.04) id AEAD2F2F006A; Fri, 06 Apr 2001 19:47:09 +0900 +Received: from go.nuinui.net (casv [10.20.30.22]) + by go.nuinui.net (Postfix) with ESMTP + id B340515B; Fri, 6 Apr 2001 19:41:05 +0900 (JST) +From: ***@error.fml.org +To: ***@error.fml.org +Subject: ** 送ったsubjectが入る +Mime-Version: 1.0 +Content-Type: text/plain; charset="ISO-2022-JP" +Content-Transfer-Encoding: 7bit +Message-Id: <2001**********.********@go.nuinui.net> +Date: Fri, 6 Apr 2001 19:41:06 +0900 (JST) + +** 送った本文が入る + |