Originating bug in 2.11.x with AM.PDP / amavisd-milter?

[Henrik K]

On Wed, Nov 07, 2018 at 08:35:21PM +0200, Henrik K wrote:
> 
> Does someone use 2.11 with amavisd-milter?
> 
> I tried upgrading from 2.10.1, but it seems 2.11.1 marks ALL messages as
> Originating.  I don't have any special policy banks, just MYNETS which is
> not hitting here.
> 
> Trying to follow the code..  with diff you can see few places where the
> handling for policy banks and originating differs.
> 
> Basically if I change in sub preprocess_policy_query
> $msginfo->originating(1) to zero, it will stay as such.  But that sub is the
> same in 2.10.1, so something later on isn't removing the originating flag
> anymore.

If I revert these removed lines to 2.11.1, it seems to work.. Mark?

--- amavisd     2018-10-09 15:41:10.000000000 +0300
+++ amavisd.o   2018-11-07 21:05:43.642754825 +0200
@@ -21838,6 +21838,7 @@
         }
       }
     }
+    $msginfo->originating(c('originating'));
     # load policy banks from the 'client_ipaddr_policy' lookup
     Amavis::load_policy_bank($_,$msginfo) for @bank_names_cl;
     # additional banks from the request
@@ -22812,6 +22813,7 @@
             }
           }
         }
+        $msginfo->originating(c('originating'));
         # load policy banks from the 'client_ipaddr_policy' lookup
         Amavis::load_policy_bank($_,$msginfo) for @bank_names_cl;