https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6591

--- Comment #10 from Mark Martinec <[email protected]> 2011-05-18 19:18:42 
UTC ---
Ok, so here it goes:

Tests t/trust_path.t and the t/originating_ip_hdr.t (Bug 6500) were
failing in the distribution package because the default configuration
(the 'originating_ip_headers' directives) were only present in
rules (rules/10_default_prefs.cf) in trunk/branch, but not in the
package tarball.

I attempted to solve the problem by adding the directive
'originating_ip_headers X-Originating-IP' directly into the affected
tests (also the Bug 6500 commits) - which worked ok for a tarball,
but started failing in the trunk, because of another bug:
the X-Originating-IP was now being counted twice, because it was
inserted twice in the list, by rules/10_default_prefs.cf and by
a test.

The proposed solution:

- instead of having 'originating_ip_headers X-Originating-IP'
  in each affected test, it is simpler to just add it to
  t/data/01_test_rules.cf (reverting both commits),
  benefiting future similar cases;

- avoid the duplication by fixing the Conf.pm, which now
  only adds originating header field names to the list
  if they are not already listed there.

trunk:
  Bug 6591: 3.3.2rc1 fails t/trusted_path.t tests 69, 72, 75, 78
  Sending lib/Mail/SpamAssassin/Conf.pm
  Sending t/data/01_test_rules.cf
  Sending t/originating_ip_hdr.t
  Sending t/trust_path.t
Committed revision 1124386.

-- 
Configure bugmail: 
https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

Reply via email to