rcpt-USER.AT.HOST@jankratochvil.net for lists.

lace@jankratochvil.net for the rest.

diff --git a/PerlMail/Config.pm b/PerlMail/Config.pm
index 9bec452..b1eb151 100644 (file)
--- a/PerlMail/Config.pm
+++ b/PerlMail/Config.pm
@@ -78,6 +78,29 @@ our $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd";
 
 # perlmail-sendmail
 
+my @lists=qw(
+               tacplus-l@disaster.com
+               gsm@sh.cvut.cz
+               linux-fsdevel@vger.kernel.org
+               n9k@pandora.cz
+               dev9k@pandora.cz
+               gsm@pandora.cz
+               ros-general@reactos.com
+               ros-kernel@reactos.com
+               ros-cvs@reactos.com
+               4cinfo@atrey.karlin.mff.cuni.cz
+               libtool@gnu.org
+               libtool-patches@gnu.org
+               wine-license@winehq.com
+               wine-devel@winehq.com
+               wine-patches@winehq.com
+               gtk-devel-list@gnome.org
+               gnome-vfs-list@gnome.org
+               captive-announce-list@jankratochvil.net
+               captive-list@jankratochvil.net
+               captive-devel-list@jankratochvil.net
+               );
+
 our $sendmail_orig=(-x ($_="/usr/sbin/sendmail-orig") ? $_ : "/usr/sbin/sendmail");
 # Mail-Alias-1.12 defaults to "/etc/mail/aliases" which does not exist on RedHat sendmail-8.12.5-7
 # Mail-Alias-1.12 will clutter $_ !
@@ -85,6 +108,7 @@ our @addr_addon=(Mail::Alias->new("/etc/aliases")->exists("sentout") ? ("sentout
 
 our $opt_F;    # imported
 our $is_pgp;   # imported
+my %lists=map(($_=>1),@lists);
 sub FromAddress
 {
 my($rcpt,$iserror)=@_;
@@ -108,10 +132,10 @@ my($rcpt,$iserror)=@_;
                                'pgp-'.uc($default_key).'@jankratochvil.net',
                                );
                }
-       # !$is_pgp or fallback
+       return Mail::Address->new($phrase,'lace@jankratochvil.net') if !$lists{$rcpt->address()};
        return Mail::Address->new(
                        $phrase,
-                       (!$iserror ? 'rcpt' : 'rcpterr')
+                       'rcpt'
                                        .'-'
                                        .(defined($rcpt->user()) ? $rcpt->user() : "NOUSER")
                                        .".AT."

diff --git a/perlmail-sendmail b/perlmail-sendmail
index 5ea95ab..276e3dd 100755 (executable)
--- a/perlmail-sendmail
+++ b/perlmail-sendmail
@@ -153,7 +153,11 @@ for my $rcpt (@rcpts) {
        if (defined $rcpt) {    # !defined($rcpt) if we have no recipients
                local $_;
                $opt_f=FromAddress($rcpt,1)->address() if !defined $opt_f;
-               $head->replace($from_headername,FromAddress($rcpt,0)->format()) if $from_headername;
+               if ($from_headername) {
+                       if (my $fromaddr=FromAddress($rcpt,0)->format()) {
+                               $head->replace($from_headername,$fromaddr);
+                               }
+                       }
                }
 
        1;      # drop '-bm' if present as it is default anyway