v5.0.4-3 - Postfix queue id issue

[Alvaro Marín]

Hi,

thank you, I've fixed it and attached the new files in github. It's been
a mistake generating a clean file (without my debug code) to send to
github and one "if condition", sorry.  The diff:

PFDiskStore.pm:

@@ -87,7 +87,7 @@
   #
   my $long_queue_id=0;
   my $hex=$this->{hdname};
-  if ( ($this->{hdname} =~ /[A-Za-z0-9]{15}$/) &&
($MailScanner::SMDiskStore::HashDirDepth > 0)) {
+  if ($this->{hdname} =~ /[A-Za-z0-9]{15}$/) {
    # long queue id
    $long_queue_id=1;
    # With long queue IDs, when hash queues is enabled, the directory
hierarchy

Postfix.pm:

@@ -246,7 +246,7 @@

     # Bad hash key $file = sprintf("%05X%lX", time % 1000000,
(stat($file))[1]);
     # Add 1 so the number is never zero (defensive programming)
-    $file = sprintf("%05X%lX", int(rand 1000000)+1, (stat($file))[1]);
+    #$file = sprintf("%05X%lX", int(rand 1000000)+1, (stat($file))[1]);
     #print STDERR "New Filename is $file\n";

     #
@@ -277,7 +277,7 @@
     #
     my $long_queue_id=0;
     my $hex;
-    if ( ($file =~ /\-[A-Za-z0-9]{15}\.[A-Za-z0-9]{5}$/) &&
($MailScanner::SMDiskStore::HashDirDepth > 0) ) {
+    if ($file =~ /\-[A-Za-z0-9]{15}\.[A-Za-z0-9]{5}$/) {
         # Long queue IDs
         $long_queue_id=1;
         use Time::HiRes qw( gettimeofday );


Please, test it with the new patch. Is working for me:

2016-11-16 20:01:58 MailScanner[31134]: Requeue: 3tJtsZ1lrQzJX8f.A943F
to 3tJtsf6yjyzJX8p

Regards,

El 16/11/16 a las 19:24, Mark Sapiro escribió:
> See my comment "Since I installed 5.0.4-3, Mailscanner is requeuing
> using short IDs." at <https://github.com/MailScanner/v5/issues/15> which
> I just reopened.
> 


-- 
Alvaro Marín Illera
Hostalia Internet
www.hostalia.com