# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1340594930 -32400
# Node ID d5650f7361d9cc500d7172f9f91f8935361c2d56
# Parent  d089cb42619d2173b5a344bccba57cda9908e772
Abolish errors-to header.

diff -r d089cb42619d -r d5650f7361d9 after5.rb
--- a/after5.rb	Sat Jun 23 12:40:35 2012 +0900
+++ b/after5.rb	Mon Jun 25 12:28:50 2012 +0900
@@ -4,7 +4,7 @@
 # Associative Scheduling Table - after5
 # (C)2003, 2004, 2006, 2008, 2012 by HIROSE Yuuji [yuuji<at>gentei.org]
 # $Id: after5.rb,v 1.19 2012/04/01 11:52:25 yuuji Exp yuuji $
-# Last modified Sat Jun 23 12:35:30 2012 on firestorm
+# Last modified Mon Jun 25 12:28:01 2012 on firestorm
 # See http://www.gentei.org/~yuuji/software/after5/
 # このスクリプトはEUCで保存してください。
 $hgid = <<_HGID_.split[1..-2].join(" ")
@@ -2721,7 +2721,7 @@
     # $DEFAULT is ML name
     viamail = ENV['LOCAL'] && ENV['DEFAULT'] # called via mail
     from = toadmin = nil
-    adminsuffix = @mailadmdelimiter+"admin"
+    adminsuffix = @mailadmdelimiter+"adm-"
     unless @opt['mailprefix'] && @opt['maildomain']
       if viamail
         STDERR.print msg('sendall_err') % [@opt['conf']]
@@ -2735,10 +2735,10 @@
       prohibitviahttp()
       name = ENV['DEFAULT']
       if Regexp.new("(.*)("+Regexp.quote(adminsuffix)+")") =~ name
-        # To: GROUP/admin@domain
+        # To: GROUP/adm*@domain
         #   -> Forward to group administrator(s)
         name, toadmin = $1, $2
-        sendMail("yuuji@es.gentei.org", 'dummy',
+        sendMail("dummy", 'dummy', # Original To: and Subject: go through
                  STDIN.readlines.join, nil, @sc.admins(name),
                  {"Return-path" => @opt['maintainer']}, :thru)
         exit 0
@@ -2767,7 +2767,7 @@
     fromhack = @sc.getgroupattr(name, 'fromhack')
     mldir = "ml/"+name
     to = @sc.getgroupattr(name, 'mladdress') || defaultmladdress(name)
-    errorsto = to.sub("@", adminsuffix+"@")
+    returnpath = to.sub("@", adminsuffix+"@")
     subj = @params['subject'] || "Message from "+@myname
     sjtag = bracket.gsub("%n", nickname(name)).
       gsub("%i", name).
@@ -2790,8 +2790,7 @@
       "X-ML-Driver-URI" => $myurl,
       "X-ML-Name" => name,
       "X-ML-URI" => sprintf("%s?-groupman+%s", @opt['url'], name),
-      "Errors-to" => errorsto,
-      "Return-path" => errorsto}
+      "Return-path" => returnpath}
     Dir.chdir @mydir
     rcpts = if grepgroup(name)
               @sc.members(name)
@@ -2800,6 +2799,7 @@
             end.collect {|u| mailaddress(u, name).split(/,\s*|\s+/)}.flatten
     # p rcpts
     # p to
+    ENV["QMAILINJECT"] = "r"    # for ML mode, use verp
     sendMail(to, subj, body, from, rcpts,
              header,
              ENV['SENDER'],