chiark
/
gitweb
/
~webstump
/
modbot-mtm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Actual error messages
[modbot-mtm.git]
/
stump
/
bin
/
processPreapproved
diff --git
a/stump/bin/processPreapproved
b/stump/bin/processPreapproved
index 38eb7148756ec1a8d2911a78985cda328013722a..5933a2b52e7c8e71acb74fd65663d8f84f22aa2c 100755
(executable)
--- a/
stump/bin/processPreapproved
+++ b/
stump/bin/processPreapproved
@@
-14,22
+14,22
@@
$GoodGuys = "$MNG_ROOT/data/good.guys.list";
$Argv = join( ' ', @ARGV );
$Argv = join( ' ', @ARGV );
-open( PROCESS_APPROVED, "|processApproved $Argv" );
+open( PROCESS_APPROVED, "|processApproved $Argv" )
or die $!
;
while( <STDIN> ) {
$From = $_ if( /^From: / );
while( <STDIN> ) {
$From = $_ if( /^From: / );
- print PROCESS_APPROVED;
+ print PROCESS_APPROVED
or die $!
;
chop;
last if( /^$/ );
}
while( <STDIN> ) { # Body
chop;
last if( /^$/ );
}
while( <STDIN> ) { # Body
- print PROCESS_APPROVED;
+ print PROCESS_APPROVED
or die $!
;
}
}
-close PROCESS_APPROVED;
+close PROCESS_APPROVED
or die "$? $!"
;
$From =~ s/^From: //g;
if( $From =~ m/([\w-\.]*)\@([\w-\.]+)/ ) {
$From =~ s/^From: //g;
if( $From =~ m/([\w-\.]*)\@([\w-\.]+)/ ) {
@@
-41,9
+41,9
@@
if( $From =~ m/([\w-\.]*)\@([\w-\.]+)/ ) {
if( !&nameIsInList( $From, "good.guys.list" ) ) { # need to preapprove
&logAction( "Action: processPreapproved $From\n" );
if( !&nameIsInList( $From, "good.guys.list" ) ) { # need to preapprove
&logAction( "Action: processPreapproved $From\n" );
- open( GOOD_GUYS, ">>$GoodGuys" );
- print GOOD_GUYS "$From\n";
- close( GOOD_GUYS );
+ open( GOOD_GUYS, ">>$GoodGuys" )
or die $!
;
+ print GOOD_GUYS "$From\n"
or die $!
;
+ close( GOOD_GUYS )
or die $!
;
} else {
print STDERR "$From already preapproved\n";
}
} else {
print STDERR "$From already preapproved\n";
}