]> git.sommitrealweird.co.uk Git - onak.git/commitdiff
Avoid race condition when receiving incoming mails
authorJonathan McDowell <noodles@earth.li>
Wed, 25 Apr 2012 04:15:38 +0000 (21:15 -0700)
committerJonathan McDowell <noodles@earth.li>
Wed, 25 Apr 2012 04:15:38 +0000 (21:15 -0700)
  There's a race condition between us starting to accept a new incoming
  mail and taking the lock to start processing it; a second copy of
  onak-mail may come in and start to process the incomplete mail we're
  in the process of receiving. Receive to a tmp file and rename to .onak
  after we've received everything.

  Fixes Debian bug #650557. Thanks to Helmut Grohne <helmut@subdivi.de>

onak-mail.pl.in

index 77a3d3677de9174f42587601bf8bb802be8894bf..96fce71008e10bf178d5e5d7ac67f34e80414b6e 100644 (file)
@@ -212,11 +212,12 @@ my $tmpfile = sprintf "%s/%04d%02d%02d-%02d%02d%02d-%d.onak",
                        $time[1],
                        $time[0],
                        $$;
                        $time[1],
                        $time[0],
                        $$;
-open(MAILFILE, '>'.$tmpfile);
+open(MAILFILE, '>'.$tmpfile.'.tmp');
 while (<>) {
        print MAILFILE $_;
 }
 close(MAILFILE);
 while (<>) {
        print MAILFILE $_;
 }
 close(MAILFILE);
+rename $tmpfile.".tmp", $tmpfile;
 
 #
 # Lock here to ensure that only one copy of us is processing the incoming
 
 #
 # Lock here to ensure that only one copy of us is processing the incoming