Merge branch 'master' of /u/webstump/live/

[modbot-mtm.git] / stump / bin / processNoack.pl

diff --git a/stump/bin/processNoack.pl b/stump/bin/processNoack.pl
index 33f3d047b35886d5be19b59d5c374cdc09f1d80e..ab468d20b77a15cb3977dba6e040e09288abe829 100755 (executable)
--- a/stump/bin/processNoack.pl
+++ b/stump/bin/processNoack.pl
@@ -20,14 +20,13 @@ while( <STDIN> ) {
 }
 
 $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;
 }
 
-if( !&nameIsInList( $From, "noack.list" ) ) { # need to preapprove
+if( !&nameIsInListExactly( $From, "noack.list" ) ) { # need to preapprove
   print STDERR "Adding $From to the noack list...\n";
   open( NOACK, ">>$NoAckFile" ) or die $!;
     print NOACK "$From\n" or die $!;