scramble addresses more

10 files changed, 66 insertions, 203 deletions

diff --git a/regress/errormails/biglobe.ne.jp b/regress/errormails/biglobe.ne.jp
index 0f20cc6f..bd180e93 100644
--- a/regress/errormails/biglobe.ne.jp
+++ b/regress/errormails/biglobe.ne.jp
@@ -28,64 +28,27 @@ The number of messages in recipient's mailbox exceeded the local limit.
 ----_Biglobe120310/24105.biglobe.ne.jp
 Content-Type: message/rfc822
 
-Received: from rcpt-impgw.biglobe.ne.jp by biglobe.ne.jp (RCPT_GW)
-	id MAA24105; Fri, 23 Mar 2001 12:03:09 +0900 (JST)
-Received: from ahodori.fml.org (ahodori.fml.org [202.232.137.17])
-	by rcpt-impgw.biglobe.ne.jp (8.9.3+3.2W/3.7W-01032209) with SMTP id MAA24093
-	for <rudo@xxx.biglobe.ne.jp>; Fri, 23 Mar 2001 12:03:09 +0900 (JST)
-Received: (qmail 2133 invoked from network); 23 Mar 2001 03:02:42 -0000
-Received: from localhost (HELO albatros.fml.org) (127.0.0.1)
-  by localhost with SMTP; 23 Mar 2001 03:02:42 -0000
-Received: from beth.sapporo.iij.ad.jp (ahodori.fml.org [202.232.137.17])
-	by ahodori.fml.org (Postfix) with ESMTP id 5FE73866B7
-	for <fml-help@ffs.fml.org>; Fri, 23 Mar 2001 12:02:24 +0900 (JST)
-Received: from sapporo.iij.ad.jp (beth.sapporo.iij.ad.jp [192.168.148.3])
-	by beth.sapporo.iij.ad.jp (Postfix) with ESMTP id 3BBE7A6822
-	for <fml-help@ffs.fml.org>; Fri, 23 Mar 2001 12:02:10 +0900 (JST)
-Delivered-To: fml-help@ffs.fml.org
-Date: Fri, 23 Mar 2001 12:02:27 +0900
-X-Posted: Fri, 23 Mar 2001 12:02:10 +0900
-From: "Ken'ichi Fukamachi" <fukachan@sapporo.iij.ad.jp>
-Reply-To: fml-help@ffs.fml.org
-Subject: Re: pull up request to 4.0.1
-To: fml-help@ffs.fml.org
-Message-Id: <20010323030211.3BBE7A6822@beth.sapporo.iij.ad.jp>
-In-Reply-To: your message of "Fri, 23 Mar 2001 01:54:58 +0900."
-             <20010322165449.DC7DDA6822@beth.sapporo.iij.ad.jp>
-X-ML-Name: fml-help
-X-Mail-Count: 00048
-X-MLServer: fml [fml 4.0A  (20010311)]; post only (only members can post)
-X-Stardate: [-30]6370.63
-X-ML-Info: If you have a question, send e-mail with the body
-	"help" (without quotes) to the address fml-help-ctl@ffs.fml.org;
-	help=<mailto:fml-help-ctl@ffs.fml.org?body=help>
+Return-Path: <fukachan@fml.org>
+Received: from hikari.fml.org (hikari.fml.org [192.168.1.6])
+	by elena.fml.org (Postfix) with ESMTP id C995C1D8C9
+	for <mailbox@elena.fml.org>; Tue,  2 Jan 2001 17:08:05 +0900 (JST)
+Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
+Received: by iris.fml.org (Postfix, from userid 0)
+	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
+From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+To: elena@nuinui.net
+Reply-To: rudo@nuinui.net
+Subject: [elena:00300] test 01
+	appended_mesg
+Message-Id: <20010102080803.1BCBE15024@iris.fml.org>
+Date: Tue,  2 Jan 2001 17:08:03 +0900 (JST)
 Mime-Version: 1.0
-Content-Type: text/plain; charset="iso-2022-jp"
+Content-Type: text/plain; charset=ISO-2022-JP
 Content-Transfer-Encoding: 7bit
-Precedence: bulk
-Lines: 16
-List-Software: fml [fml 4.0A  (20010311)]
-List-Post: <mailto:fml-help@ffs.fml.org>
-List-Owner: <mailto:fml-help-admin@ffs.fml.org>
-List-Help: <mailto:fml-help-ctl@ffs.fml.org?body=help>
-List-Unsubscribe: <mailto:fml-help-ctl@ffs.fml.org?body=unsubscribe>
-
-in fml-help ML's Count: 00047
-I wrote:
->$@%Q%C%A(J(fml-support: 09336)$@$"$F$^$7$?(J _o_ 
->4.0.1 $@$X%^!<%8$9$k%j%9%H(J update
-
-done.
 
->fml/proc/libamctl.pl
->	new revision: 2.46; previous revision: 2.45
->
->	apply patch by shigetoshi hirano (fml-support: 09336)
->
->	$@EPO?;~$N=EJ#%A%'%C%/$,H4$1$F$$$k(J ( DBMS $@$r;H$&>l9g$N$_(J )
->	$@!t%G%P%C%0$9$k;~$K$"$H$^$o$7$K$7$F$=$N$^$^K:$l$?$s$@$H;W$&(J
+test message
 
-$@?<D.!s$5$C$]$m!w(JIIJ
+-- rudo's mabuachi
 
 ----_Biglobe120310/24105.biglobe.ne.jp--
 
diff --git a/regress/errormails/dsn b/regress/errormails/dsn
index b9e774c0..36601cc5 100644
--- a/regress/errormails/dsn
+++ b/regress/errormails/dsn
@@ -64,92 +64,27 @@ Diagnostic-Code: X-Postfix; Name service error for test.fml.org: Host not
 Content-Description: Undelivered Message
 Content-Type: message/rfc822
 
-Received: from albatros.fml.org (localhost [127.0.0.1])
-	by ahodori.fml.org (Postfix) with ESMTP
-	id C687D866E0; Sun, 25 Mar 2001 22:34:15 +0900 (JST)
-Received: from beth.fml.org (ahodori.fml.org [202.232.137.17])
-	by ahodori.fml.org (Postfix) with ESMTP id A761B86657
-	for <fml-help@ffs.fml.org>; Sun, 25 Mar 2001 22:34:07 +0900 (JST)
-Received: from fml.org (beth.fml.org [192.168.148.3])
-	by beth.fml.org (Postfix) with ESMTP id 83A50A6822
-	for <fml-help@ffs.fml.org>; Sun, 25 Mar 2001 22:34:04 +0900 (JST)
-Delivered-To: fml-help@ffs.fml.org
-Date: Sun, 25 Mar 2001 22:34:12 +0900
-X-Posted: Sun, 25 Mar 2001 22:34:04 +0900
-From: Ken'ichi Fukamachi <fukachan@fml.org>
-Reply-To: fml-help@ffs.fml.org
-Subject: TODO: can I update MIME library ?
-To: fml-help@ffs.fml.org
-Message-Id: <20010325133404.83A50A6822@beth.fml.org>
-X-ML-Name: fml-help
-X-Mail-Count: 00063
-X-MLServer: fml [fml 4.0A  (20010323)]; post only (only members can post)
-X-Stardate: [-30]6382.81
-X-ML-Info: If you have a question, send e-mail with the body
-	"help" (without quotes) to the address fml-help-ctl@ffs.fml.org;
-	help=<mailto:fml-help-ctl@ffs.fml.org?body=help>
+Return-Path: <fukachan@fml.org>
+Received: from hikari.fml.org (hikari.fml.org [192.168.1.6])
+	by elena.fml.org (Postfix) with ESMTP id C995C1D8C9
+	for <mailbox@elena.fml.org>; Tue,  2 Jan 2001 17:08:05 +0900 (JST)
+Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
+Received: by iris.fml.org (Postfix, from userid 0)
+	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
+From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+To: elena@nuinui.net
+Reply-To: rudo@nuinui.net
+Subject: [elena:00300] test 01
+	appended_mesg
+Message-Id: <20010102080803.1BCBE15024@iris.fml.org>
+Date: Tue,  2 Jan 2001 17:08:03 +0900 (JST)
 Mime-Version: 1.0
-Content-Type: text/plain; charset="iso-2022-jp"
+Content-Type: text/plain; charset=ISO-2022-JP
 Content-Transfer-Encoding: 7bit
-Precedence: bulk
-Lines: 51
-List-Software: fml [fml 4.0A  (20010323)]
-List-Post: <mailto:fml-help@ffs.fml.org>
-List-Owner: <mailto:fml-help-admin@ffs.fml.org>
-List-Help: <mailto:fml-help-ctl@ffs.fml.org?body=help>
-List-Unsubscribe: <mailto:fml-help-ctl@ffs.fml.org?body=unsubscribe>
-
-TODO にある『 MIMEライブラリーの書きなおし』なんですが、
-fml-devel のライブラリは次のような結果を返します。
-こうしたいとおもってたんだよね？(やや自信なし)
-
-深町％さっぽろ＠IIJ
-
-入力
-   |>うじゃ あじゃじゃ<
-
-変換後
-   |>=?iso-2022-jp?B?GyRCJCYkOCRjGyhCIBskQiQiJDgkYyQ4JGMbKEI=?=<
-   |>=?iso-2022-jp?Q?=1B$B$&$8$c=1B(B?= =?iso-2022-jp?Q?=1B$B$"$8$c$8$c=1B(B?=<
-
-逆変換
-   |<うじゃ あじゃじゃ<
-   |<うじゃ あじゃじゃ<
-   |
-base64 ... ok
-qp     ... ok
-
-入力
-   |>うじゃ　あじゃじゃ<
-
-変換後
-   |>=?iso-2022-jp?B?GyRCJCYkOCRjISEkIiQ4JGMkOCRjGyhC?=<
-   |>=?iso-2022-jp?Q?=1B$B$&$8$c!!$"$8$c$8$c=1B(B?=<
-
-逆変換
-   |<うじゃ　あじゃじゃ<
-   |<うじゃ　あじゃじゃ<
-   |
-base64 ... ok
-qp     ... ok
-
-入力
-   |>うじゃ
-   |あじゃじゃ<
-
-変換後
-   |>=?iso-2022-jp?B?GyRCJCYkOCRjGyhCChskQiQiJDgkYyQ4JGMbKEI=?=<
-   |>=?iso-2022-jp?Q?=1B$B$&$8$c=1B(B?=
-   |=?iso-2022-jp?Q?=1B$B$"$8$c$8$c=1B(B?=<
-
-逆変換
-   |<うじゃ
-   |あじゃじゃ<
-   |<うじゃ
-   |あじゃじゃ<
-   |
-base64 ... ok
-qp     ... ok
+
+test message
+
+-- rudo's mabuachi
 
 --C687D866E0.986737575/ahodori.fml.org--
 
diff --git a/regress/errormails/fetchmail b/regress/errormails/fetchmail
index 8911e7a1..6a6fc68c 100644
--- a/regress/errormails/fetchmail
+++ b/regress/errormails/fetchmail
@@ -33,7 +33,7 @@ Received: from hikari.fml.org (hikari.fml.org [192.168.1.6])
 Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
 Received: by iris.fml.org (Postfix, from userid 0)
 	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
-From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+From: fukachan@fml.org (Ken'ichi Fukamachi)
 To: elena@nuinui.net
 Reply-To: rudo@nuinui.net
 Subject: [elena:00300] test 01
diff --git a/regress/errormails/intermail b/regress/errormails/intermail
index 4ed00b9a..97275dd4 100644
--- a/regress/errormails/intermail
+++ b/regress/errormails/intermail
@@ -42,7 +42,7 @@ Content-Type: message/rfc822
 Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
 Received: by iris.fml.org (Postfix, from userid 0)
 	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
-From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+From: fukachan@fml.org (Ken'ichi Fukamachi)
 To: elena@nuinui.net
 Reply-To: rudo@nuinui.net
 Subject: [elena:00300] test 01
diff --git a/regress/errormails/interscan b/regress/errormails/interscan
index 4a6f4339..b82119c1 100644
--- a/regress/errormails/interscan
+++ b/regress/errormails/interscan
@@ -14,7 +14,7 @@ Could not deliver mail to this user.
 Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
 Received: by iris.fml.org (Postfix, from userid 0)
 	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
-From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+From: fukachan@fml.org (Ken'ichi Fukamachi)
 To: elena@nuinui.net
 Reply-To: rudo@nuinui.net
 Subject: [elena:00300] test 01
diff --git a/regress/errormails/mailsweeper b/regress/errormails/mailsweeper
index 6396e760..b7df6d6d 100644
--- a/regress/errormails/mailsweeper
+++ b/regress/errormails/mailsweeper
@@ -43,7 +43,7 @@ Received: from hikari.fml.org (hikari.fml.org [192.168.1.6])
 Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
 Received: by iris.fml.org (Postfix, from userid 0)
 	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
-From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+From: fukachan@fml.org (Ken'ichi Fukamachi)
 To: elena@nuinui.net
 Reply-To: rudo@nuinui.net
 Subject: [elena:00300] test 01
diff --git a/regress/errormails/nifty.ne.jp b/regress/errormails/nifty.ne.jp
index d682d3b9..1ca5f8cf 100644
--- a/regress/errormails/nifty.ne.jp
+++ b/regress/errormails/nifty.ne.jp
@@ -23,7 +23,7 @@ Received: from ns.nuinui.net (ns.nuinui.net [10.20.30.27])
 Received: from ahodori.fml.org ([10.20.30.30])
 	by ns.nuinui.net (8.9.3/8.9.3) with SMTP id XAA02030
 	for <rudo@nuinui.net>; Sat, 14 Oct 2000 23:21:44 +0900
-From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+From: fukachan@fml.org (Ken'ichi Fukamachi)
 To: elena@nuinui.net
 Reply-To: rudo@nuinui.net
 Subject: [elena:00300] test 01
diff --git a/regress/errormails/odn.ne.jp b/regress/errormails/odn.ne.jp
index 03cecd6e..7ad00eb1 100644
--- a/regress/errormails/odn.ne.jp
+++ b/regress/errormails/odn.ne.jp
@@ -33,7 +33,7 @@ Received: from hikari.fml.org (hikari.fml.org [192.168.1.6])
 Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
 Received: by iris.fml.org (Postfix, from userid 0)
 	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
-From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+From: fukachan@fml.org (Ken'ichi Fukamachi)
 To: elena@nuinui.net
 Reply-To: rudo@nuinui.net
 Subject: [elena:00300] test 01
diff --git a/regress/errormails/qmail b/regress/errormails/qmail
index 05bf828c..7b0f65bb 100644
--- a/regress/errormails/qmail
+++ b/regress/errormails/qmail
@@ -69,62 +69,27 @@ I'm not going to try again; this message has been in the queue too long.
 
 --- Below this line is a copy of the message.
 
-Return-Path: <fml-help-admin@ffs.fml.org>
-Received: (qmail 7869 invoked from network); 1 Apr 2001 23:52:46 -0000
-Received: from localhost (HELO albatros.fml.org) (10.20.30.74)
-  by localhost with SMTP; 1 Apr 2001 23:52:46 -0000
-Return-Path: <fml-help-admin@ffs.fml.org>
-Received: from eve.fml.org (eve.fml.org [10.20.30.77])
-	by ahodori.fml.org (Postfix) with ESMTP
-	id 8767D86661; Mon,  2 Apr 2001 08:52:31 +0900 (JST)
-Received: by eve.fml.org; id IAA00756; Mon, 2 Apr 2001 08:52:31 +0900 (JST)
-Received: from katri.fml.org(10.20.30.81) by eve.fml.org via smap (V4.2)
-	id xma000741; Mon, 2 Apr 01 08:51:39 +0900
-Received: by katri.fml.org (Postfix, from userid 1106)
-	id C44165B39A; Mon,  2 Apr 2001 08:51:35 +0900 (JST)
-Delivered-To: fml-help@ffs.fml.org
-Date: Mon, 2 Apr 2001 08:52:35 +0900
-X-Posted: Mon,  2 Apr 2001 08:51:35 +0900 (JST)
-From: fukachan@cvs.fml.org
-Reply-To: fml-help@ffs.fml.org
-Subject: fml cvs weekly changes (20010402)
-Sender: fukachan@katri.fml.org
-To: fml-users@ffs.fml.org, fml-help@ffs.fml.org
-Message-Id: <20010401235135.C44165B39A@katri.fml.org>
-X-ML-Name: fml-help
-X-Mail-Count: 00085
-X-MLServer: fml [fml 4.0A  (20010323)]; post only (only members can post)
-X-ML-Info: If you have a question, send e-mail with the body
-	"help" (without quotes) to the address fml-help-ctl@ffs.fml.org;
-	help=<mailto:fml-help-ctl@ffs.fml.org?body=help>
-Precedence: bulk
-Lines: 23
-List-Software: fml [fml 4.0A  (20010323)]
-List-Post: <mailto:fml-help@ffs.fml.org>
-List-Owner: <mailto:fml-help-admin@ffs.fml.org>
-List-Help: <mailto:fml-help-ctl@ffs.fml.org?body=help>
-List-Unsubscribe: <mailto:fml-help-ctl@ffs.fml.org?body=unsubscribe>
-
-
-Updating fml tree:
-U CHANGES
-U Makefile
-U Makefile.local
-U doc/Japanese/internals/overview.wix
-U doc/devel/OS_and_Perl.txt
-U doc/ri/CHANGES-4.0.1.wix
-U doc/ri/INSTALL_with_POSTFIX.wix
-U doc/ri/TODO.wix
-U kern/Makefile
-U messages/Japanese/amctl
-U proc/libamctl.pl
-
-Updating stable fml tree (fml-4-0-maint):
-U doc/Japanese/internals/overview.wix
-U doc/ri/CHANGES-4.0.1.wix
-U doc/ri/INSTALL_with_POSTFIX.wix
-U kern/Makefile
-U messages/Japanese/amctl
-U proc/libamctl.pl
+Return-Path: <fukachan@fml.org>
+Received: from hikari.fml.org (hikari.fml.org [192.168.1.6])
+	by elena.fml.org (Postfix) with ESMTP id C995C1D8C9
+	for <mailbox@elena.fml.org>; Tue,  2 Jan 2001 17:08:05 +0900 (JST)
+Received: by hikari.fml.org (8.9.3/3.4W6+Hikari-2.1) with ESMTP id RAA17788 for <caesar@fml.org>; Tue, 2 Jan 2001 17:08:04 +0900 (JST)
+Received: by iris.fml.org (Postfix, from userid 0)
+	id 1BCBE15024; Tue,  2 Jan 2001 17:08:03 +0900 (JST)
+From: fukachan@sapporo.iij.ad.jp (Ken'ichi Fukamachi)
+To: elena@nuinui.net
+Reply-To: rudo@nuinui.net
+Subject: [elena:00300] test 01
+	appended_mesg
+Message-Id: <20010102080803.1BCBE15024@iris.fml.org>
+Date: Tue,  2 Jan 2001 17:08:03 +0900 (JST)
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-2022-JP
+Content-Transfer-Encoding: 7bit
+
+test message
+
+-- rudo's mabuachi
+
 
 -- fukachan@cvs.fml.org
diff --git a/regress/errormails/smi-8.6 b/regress/errormails/smi-8.6
index e7f7ca39..b4dde458 100644
--- a/regress/errormails/smi-8.6
+++ b/regress/errormails/smi-8.6
@@ -41,9 +41,9 @@ From: kenken@nuinui.net
 Subject: Re: makefml
 To: fml-support@ffs.fml.org
 Message-Id: <200102171936.EAA20832@ff.iij4u.or.jp>
-In-Reply-To: <20010201162311.A0B6BA68F0@beth.sapporo.iij.ad.jp>
+In-Reply-To: <20010201162311.A0B6BA68F0@beth.fml.org>
 References: <200101300658.PAA14052@ff.iij4u.or.jp>
-	<20010201162311.A0B6BA68F0@beth.sapporo.iij.ad.jp>
+	<20010201162311.A0B6BA68F0@beth.fml.org>
 X-ML-Name: fml-support
 X-Mail-Count: 09276
 X-MLServer: fml [fml 4.0 STABLE (20010201)]; post only (only members can post)