Improve comments in scan_incoming

diff --git a/gatekeeper.pl b/gatekeeper.pl
index d26db21792a07a0309f48ad2c7ac46c23bf1434b..c9527880a49178f770bc53b514fa25d11c1a5970 100755 (executable)
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -929,10 +929,9 @@ sub scan_incoming {
   #
   # Note that lsof outputs absolute names.
   #
-
-  # this lsof test only works if either
-  # a) lsof is not compiled with HASSECURITY
-  # b) the vsftpd ftp_user is set to the same user ftp_upload runs as
+  # This lsof test only works if either:
+  #   a) lsof is not compiled with HASSECURITY
+  #   b) gatekeeper runs as the vsftpd ftp_user
   # If neither of those 2 conditions are met, the lsof call will not see
   # the open files because they are owned by another user.
   # On modern (Debian) systems, condition a) is not met.
@@ -990,11 +989,11 @@ sub scan_incoming {
     } elsif (exists($possible{$base}) && !exists($possible{"$bare_base.sig"})
             && ($base =~ /\.directive\.asc$/)) {
 
-      # Here we have a potential problem. It's possible that we are seeing a
-      # directive file that belongs to a triplet the rest of which has not been
-      # uploaded yet. If so, we should ignore this file and not move it to
-      # $directory. This means we need to read the file and see if there is a
-      # 'filename:' directive.
+      # Here we have a potential problem. It's possible that we are seeing
+      # a directive file that belongs to a triplet the rest of which has
+      # not been uploaded yet. If so, we should ignore this file and not
+      # move it to $scratchpad. This means we need to read the file and see
+      # if there is a 'filename:' directive.
 
       my $racecondition = 0;
       open(TMP,$base);