probes: logfile for easy viewing

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

diff --git a/stump/bin/processNoack.pl b/stump/bin/processNoack.pl
index 38c29fe63804433fe955356b51c9ad2b668cac68..ab468d20b77a15cb3977dba6e040e09288abe829 100755 (executable)
--- a/stump/bin/processNoack.pl
+++ b/stump/bin/processNoack.pl
@@ -20,18 +20,17 @@ 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" );
-    print NOACK "$From\n";
-  close( NOACK );
+  open( NOACK, ">>$NoAckFile" ) or die $!;
+    print NOACK "$From\n" or die $!;
+  close( NOACK ) or die $!;
 } else {
   print STDERR "$From already is in noack list\n";
 }