Return-Path: Delivered-To: apmail-spamassassin-commits-archive@www.apache.org Received: (qmail 53517 invoked from network); 10 Mar 2010 17:41:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Mar 2010 17:41:48 -0000 Received: (qmail 32485 invoked by uid 500); 10 Mar 2010 17:41:17 -0000 Delivered-To: apmail-spamassassin-commits-archive@spamassassin.apache.org Received: (qmail 32467 invoked by uid 500); 10 Mar 2010 17:41:17 -0000 Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "SpamAssassin Dev" List-Id: Delivered-To: mailing list commits@spamassassin.apache.org Received: (qmail 32460 invoked by uid 99); 10 Mar 2010 17:41:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 17:41:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 17:41:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4118723889ED; Wed, 10 Mar 2010 17:40:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r921471 - /spamassassin/branches/3.3/spamd/spamd.raw Date: Wed, 10 Mar 2010 17:40:54 -0000 To: commits@spamassassin.apache.org From: mmartinec@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100310174054.4118723889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmartinec Date: Wed Mar 10 17:40:53 2010 New Revision: 921471 URL: http://svn.apache.org/viewvc?rev=921471&view=rev Log: Bug 6340, small updates according to offline correspondence with Andrej Sossi, the original patch author Modified: spamassassin/branches/3.3/spamd/spamd.raw Modified: spamassassin/branches/3.3/spamd/spamd.raw URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/spamd/spamd.raw?rev=921471&r1=921470&r2=921471&view=diff ============================================================================== --- spamassassin/branches/3.3/spamd/spamd.raw (original) +++ spamassassin/branches/3.3/spamd/spamd.raw Wed Mar 10 17:40:53 2010 @@ -2183,14 +2183,15 @@ sub handle_user_vpopmail { while (@aliases) { my $vpopusername_tainted = shift(@aliases); local $1; - if ($vpopusername_tainted =~ /.+ -> &?(.+)/) { + if ($vpopusername_tainted =~ /^.+ -> &?(.+)/) { $vpopusername = untaint_var($1); - if ($vpopusername =~ s{(/.+)/Maildir/}{$1}) { + if ($vpopusername =~ s{^(/.+)/Maildir/$}{$1}) { # this is the path to a real mailbox $userdir = $vpopusername; - } elsif ($vpopusername =~ /\@/) { + } elsif ($vpopusername !~ /^[#| \t]/ && + $vpopusername =~ /^[^@ \t]+\@[^@ \t]+\s*$/) { # this is a forward to another e-mail address - $vpopusername =~ s{.+ -> (.+)}{$1}; + $vpopusername =~ s{^.+ -> (.+)}{$1}; $vpopusername_tainted = `$vpopdir/bin/vuserinfo -d \Q$vpopusername\E`; if ($? == 0 && $vpopusername_tainted ne '') { $userdir = untaint_var($vpopusername_tainted);