Alter requeue logic for MSDiskStore.pm (#568)

MailScanner · Nov 15, 2021 · cdbb39a · cdbb39a
1 parent 02faca0
commit cdbb39a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.4.2-1
+5.4.2-2
diff --git a/changelog b/changelog
@@ -1,3 +1,8 @@
+11/14/2021 Changes in    v5.4.2-2 (beta)
+==================================
+
+- Eliminate queue id change in MSDiskStore.pm
+
 11/14/2021 Changes in    v5.4.2-1 (beta)
 ==================================
 

diff --git a/common/usr/share/MailScanner/perl/MailScanner/MSDiskStore.pm b/common/usr/share/MailScanner/perl/MailScanner/MSDiskStore.pm
@@ -335,14 +335,10 @@ sub WriteHeader {
   MailScanner::Lock::unlockclose($Tf);
   undef $Tf; # Try to ensure Tf is completely closed, flushed, everything
 
-  my $hdoutfile;
-  my $hddirbase; 
-  ($hddirbase, $hdoutfile) =
-      MailScanner::Sendmail::HDOutFileName($tfile);
-  rename "$tfile", "$hddirbase/$hdoutfile"
+  rename "$tfile", $Outq . '/' . $message->{id}
       or MailScanner::Log::DieLog("Cannot rename clean %s to %s, %s",
-                                  $tfile, $hdoutfile, $!);
-  MailScanner::Log::InfoLog("Requeue: %s to %s", $message->{id},$hdoutfile);
+                                  $tfile, $message->{id}, $!);
+  MailScanner::Log::InfoLog("Requeue: %s to %s", $message->{id},$message->{id});
 }
 
 # Return the size of the message (Header+body)