From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Sun, 11 Jul 2021 20:51:31 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/adefaria/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=6ee4bd4718471ce8ba4a8416a0bee09b082e0f13;hp=1f5737d7c0b97ac29c72a9f0cd883bd6211edec9;p=clearscm.git

Merge branch 'master' of https://github.com/adefaria/clearscm
---

diff --git a/maps/bin/display.cgi b/maps/bin/display.cgi
index 14c2553..533ecae 100755
--- a/maps/bin/display.cgi
+++ b/maps/bin/display.cgi
@@ -79,7 +79,10 @@ sub Body($) {
 
   my $parser = MIME::Parser->new();
 
+  # For some strange reason MIME::Parser has started having some problems
+  # with writing out tmp files...
   $parser->output_to_core(1);
+  $parser->tmp_to_core(1);
 
   my $entity = $parser->parse_data ($message);
 
diff --git a/maps/lib/MAPS.pm b/maps/lib/MAPS.pm
index b1df123..72594c2 100644
--- a/maps/lib/MAPS.pm
+++ b/maps/lib/MAPS.pm
@@ -1937,10 +1937,10 @@ sub Whitelist ($$;$$) {
   # Now call MAPSDeliver
   my $status = system "$FindBin::Bin/MAPSDeliver $userid /tmp/MAPSMessage.$$";
 
-  unlink "/tmp/MAPSMessage.$$";
-
   if ($status == 0) {
     Logmsg("whitelist", $sender, "Delivered message");
+  
+    unlink "/tmp/MAPSMessage.$$";
   } else { 
     Error("Unable to deliver message - is MAPSDeliver setgid? - $!");
   } # if