Comment 2 for bug 1770532

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

There are two patches floating out there:

a) https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html (the one you applied I believe)
--- amavisd.orig Tue Apr 26 21:24:33 2016
+++ amavisd Fri Jul 1 01:03:15 2016
@@ -34338,6 +34329,7 @@ sub collect_some_dkim_info($) {
     $sig_ind++;
   }
   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
+ $msginfo->originating(c('originating'));
   $msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid;
 # if (ll(5) && $sig_ind > 0) {
 # # show which header fields are covered by which signature

b) https://lists.amavis.org/pipermail/amavis-users/2018-February/005297.html
--- amavisd.orig Tue Apr 26 21:24:33 2016
+++ amavisd Fri Aug 5 12:32:39 2016
@@ -22806,6 +22806,7 @@ sub process_smtp_request($$$$) {
         }
         # load policy banks from the 'client_ipaddr_policy' lookup
         Amavis::load_policy_bank($_,$msginfo) for @bank_names_cl;
+ $msginfo->originating(c('originating'));

         $msginfo->client_addr($cl_ip); # ADDR
         $msginfo->client_port($cl_port); # PORT
@@ -34338,6 +34330,7 @@ sub collect_some_dkim_info($) {
     $sig_ind++;
   }
   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
+ $msginfo->originating(c('originating'));
   $msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid; # if (ll(5) && $sig_ind > 0) {
 # # show which header fields are covered by which signature

It's unfortunate upstream is no longer responsive.

Would you perhaps be able to comment on or even test the second patch?