}
$From =~ s/^From: //;
-if( $From =~ m/([\w-\.]*)\@([\w-\.]+)/ ) {
- $From = "$1\@$2";
-} else {
+chomp $From;
+if( $From !~ m/([\w-\.]*)\@([\w-\.]+)/ || $From =~ m/\n/) {
print STDERR "From line `$From' is incorrect\n";
exit 0;
}
# checks if poster needs acknowledgment of receipt
#
sub checkAck {
- if( &nameIsInListExactly( $From, "noack.list" ) ) {
+ my $fromaddr = $From;
+ $fromaddr =~ s/^[-A-Za-z]+\s*\:\s*//;
+ print STDERR "checking noack.list for \"$From|$fromaddr\"\n";
+ if( &nameIsInListExactly( $fromaddr, "noack.list" ) ) {
$needAck = "no";
} else {
$needAck = "yes";