Mailing List Archive

Author: dos
Date: Fri Jun 17 23:27:54 2005
New Revision: 191268

URL: http://svn.apache.org/viewcvs?rev=191268&view=rev
Log:
bug 4347: whitelist_from_rcvd shouldn't require an @ sign

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=191268&r1=191267&r2=191268&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Fri Jun 17 23:27:54 2005
@@ -368,7 +368,7 @@
unless (defined $value && $value !~ /^$/) {
return $MISSING_REQUIRED_VALUE;
}
- unless ($value =~ /^\S+\@\S+\s+\S+$/) {
+ unless ($value =~ /^\S+\s+\S+$/) {
return $INVALID_VALUE;
}
$self->{parser}->add_to_addrlist_rcvd ('whitelist_from_rcvd',
@@ -383,7 +383,7 @@
unless (defined $value && $value !~ /^$/) {
return $MISSING_REQUIRED_VALUE;
}
- unless ($value =~ /^\S+\@\S+\s+\S+$/) {
+ unless ($value =~ /^\S+\s+\S+$/) {
return $INVALID_VALUE;
}
$self->{parser}->add_to_addrlist_rcvd ('def_whitelist_from_rcvd',
@@ -447,7 +447,7 @@
unless (defined $value && $value !~ /^$/) {
return $MISSING_REQUIRED_VALUE;
}
- unless ($value =~ /^(?:\S+\@\S+(?:\s+\S+\@\S+)*)$/) {
+ unless ($value =~ /^(?:\S+(?:\s+\S+)*)$/) {
return $INVALID_VALUE;
}
$self->{parser}->remove_from_addrlist_rcvd('whitelist_from_rcvd',