X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Flib%2FMAPS.pm;h=96276123c0a69031cf71cc8ac9477f464cd4b9e2;hb=88c9cb9f6ed80dd31981b083593b1746695083b9;hp=793f015d0625e0e6cf350cac1a78d7587e4fd52b;hpb=64358086cfbaea4aa8f1eddc13161aff945523a8;p=clearscm.git diff --git a/maps/lib/MAPS.pm b/maps/lib/MAPS.pm index 793f015..9627612 100644 --- a/maps/lib/MAPS.pm +++ b/maps/lib/MAPS.pm @@ -1481,7 +1481,22 @@ sub Whitelist ($$;$$) { close $message; # Now call MAPSDeliver - my $status = system "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$"; + my ($status, @output) = Execute "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$"; + #my $status = system "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$"; + + if ($status != 0) { + my $msg = "Unable to deliver message (message left at /tmp/MAPSMessage.%%\n\n"; + $msg .= join "\n", @output; + + Logmsg( + userid => $userid, + type => 'whitelist', + sender => $sender, + message => $msg, + ); + + Error ($msg, 1); + } # if unlink "/tmp/MAPSMessage.$$";