diff options
| author | fukachan <fukachan> | 2002-12-31 11:25:16 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2002-12-31 11:25:16 +0000 |
| commit | 266be1909083adc3d2ef7c79cf43d4b5a2137a2b (patch) | |
| tree | 6ae8c517e26fff746d8cd3e0b53b20849d07895c | |
| parent | e99d3250c2d0698f3301e723350809c4666af85c (diff) | |
| download | fml8-266be1909083adc3d2ef7c79cf43d4b5a2137a2b.tar.gz fml8-266be1909083adc3d2ef7c79cf43d4b5a2137a2b.tar.bz2 fml8-266be1909083adc3d2ef7c79cf43d4b5a2137a2b.zip | |
bug fix trap pattern for more accuracy.
| -rw-r--r-- | fml/lib/Mail/Bounce/SimpleMatch.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fml/lib/Mail/Bounce/SimpleMatch.pm b/fml/lib/Mail/Bounce/SimpleMatch.pm index ddcf2b42..62ce0ecd 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.31 2002/09/22 14:57:01 fukachan Exp $ +# $FML: SimpleMatch.pm,v 1.32 2002/12/20 03:49:16 fukachan Exp $ # @@ -272,7 +272,7 @@ sub _address_match # XXX in some cases, $end_regexp not defined. last SCAN if $end_regexp && /$end_regexp/; - if (/(\S+\@\S+)/) { + if (/(\S+\@\S+\w+)/) { if ($debug) { print STDERR "trap address ($1)\n";} my $addr = $self->address_clean_up($mta_type, $1); if ($addr) { @@ -282,7 +282,7 @@ sub _address_match } } - if (/$addr_regexp/) { + if ($addr_regexp && /$addr_regexp/) { my $addr = $self->address_clean_up($mta_type, $1); if ($addr) { $result->{ $addr }->{ 'Final-Recipient' } = $addr; |