From: Jacob Bachmeyer <jcb@gnu.org>
Date: Thu, 27 Jan 2022 03:16:00 +0000 (-0600)
Subject: Improve log messages for oversize directive or signature files
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ba6d0ce5d333fbf1e993537fff032c37a9ae9f18;p=gatekeeper.git

Improve log messages for oversize directive or signature files

The new messages are easier for the testsuite to match.
---

diff --git a/upload-ftp-v1.2.pl b/upload-ftp-v1.2.pl
index b423ce1..5115516 100755
--- a/upload-ftp-v1.2.pl
+++ b/upload-ftp-v1.2.pl
@@ -632,11 +632,11 @@ sub scan_incoming {
       delete $possible{$base};
     } elsif ((-f $directive) && ((-s $directive) >= 50*1024)) {
       rename ("$incoming_dir/$directive", "$incoming_dir/.$directive");
-      ftp_syslog('info', "($log_style) $directive larger than 50KB");
+      ftp_syslog('info', "($log_style) directive file ($directive) larger than 50KB");
       &fatal("The directive file $directive is larger than 50KB. This can not be correct, ignoring upload.",0);
     } elsif ((-f $sig) && ((-s $sig) >= 50*1024)) {
       rename ("$incoming_dir/$sig", "$incoming_dir/.$sig");
-      ftp_syslog('info', "($log_style) $directive or $sig larger than 50KB");
+      ftp_syslog('info', "($log_style) signature file ($sig) larger than 50KB");
       &fatal("The signature file $sig is larger than 50KB. This can not be correct, ignoring upload.",0);
     }
   }