summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-04-09 15:34:07 +0000
committerfukachan <fukachan>2001-04-09 15:34:07 +0000
commit04bc134819d8cb629ab806de044292d15e11fe7c (patch)
treeb0bdb26bb8d54842c02d66a153d4ca2d1fe02589
parent52897b9b941a6aba2fb8a5c1a6be5504499c835c (diff)
downloadfml8-04bc134819d8cb629ab806de044292d15e11fe7c.tar.gz
fml8-04bc134819d8cb629ab806de044292d15e11fe7c.tar.bz2
fml8-04bc134819d8cb629ab806de044292d15e11fe7c.zip
merged DSN and postfix-19991231
-rw-r--r--fml/lib/Mail/Bounce/00_PARSE.ja.txt43
-rw-r--r--fml/lib/Mail/Bounce/00_README.ja.txt4
2 files changed, 2 insertions, 45 deletions
diff --git a/fml/lib/Mail/Bounce/00_PARSE.ja.txt b/fml/lib/Mail/Bounce/00_PARSE.ja.txt
index 2b6f66cf..63067edf 100644
--- a/fml/lib/Mail/Bounce/00_PARSE.ja.txt
+++ b/fml/lib/Mail/Bounce/00_PARSE.ja.txt
@@ -12,32 +12,13 @@ $RE_JOUT = '\033\([BJ]';
###############################
-
-
-
-
sub Parse
{
- my ($new_block, $gobble, $curf, $first_header_part);
- my ($mp_block, $p, $pmax);
-
$new_block = 1;
$gobble = 0;
$curf = $NULL;
$first_header_part = 1;
- # gobble error mail
- {
- $pmax = sysread(STDIN,
- $MessageBuffer,
- $MEAD_INCOMING_MAIL_SIZE_LIMIT);
-
- if ($pmax >= $MEAD_INCOMING_MAIL_SIZE_LIMIT) {
- &Log("warn: input mail is too large");
- &Log("warn: check the fisrt $MEAD_INCOMING_MAIL_SIZE_LIMIT bytes");
- }
- &Log("log: read $pmax bytes") if $debug;
- }
my ($msgbufp, $msgbufp1);
for ($msgbufp = 0; $msgbufp <= $pmax; ) {
@@ -133,28 +114,6 @@ sub Parse
}
- ###
- ### RFC1891,1894 DSN
- ###
- if ($mp_block =~ /delivery\-status/i) {
- if (/^Final-Recipient:.*\s+(\S+\@\S+)/i) {
- $DSN_FinalRecipient = &BareAddr($1);
- }
- elsif (/^Original-Recipient:.*\s+(\S+\@\S+)/i) {
- $DSN_OriginalRecipient = &BareAddr($1);
- }
- elsif (/^Status:\s*5/i) {
- if ($DSN_OriginalRecipient) {
- &CacheOn($DSN_OriginalRecipient, " ");
- }
- if ($DSN_FinalRecipient) {
- &CacheOn($DSN_FinalRecipient, " ");
- }
-
- $found++;
- }
- }
-
# smtpfeed -1 -F hack
if (/^To: \(original recipient in envelope at \S+\) <(\S+)>/) {
&PickUpHint($1);
@@ -307,5 +266,3 @@ sub Parse
}
}
}
-
-
diff --git a/fml/lib/Mail/Bounce/00_README.ja.txt b/fml/lib/Mail/Bounce/00_README.ja.txt
index 42623015..d7ce6f17 100644
--- a/fml/lib/Mail/Bounce/00_README.ja.txt
+++ b/fml/lib/Mail/Bounce/00_README.ja.txt
@@ -3,10 +3,10 @@
入力は
Mail::Message オブジェクトの形で
+ 入力の最大値は?
+
出力は
ハッシュで {
-
駄目そうなメールアドレス => 理由
-
}