Committed with r1843622 on 2018-10-12 in 3.4 and trunk,
thanks anyway.
Cheers
Giovanni
On 12/1/18 6:29 PM, John Capo wrote:
> With the correct sender address this time :(
>
> ---
> /usr/local/src/Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/TxRep.pm
> 2018-12-01 12:19:53.067968000 -0500
> +++ /usr/local/lib/perl5/site_perl/Mail/SpamAssassin/Plugin/TxRep.pm
> 2018-12-01 12:23:42.183385000 -0500
> @@ -1739,7 +1739,7 @@
> if (!defined $origip) {
> # could not find an IP address to use
> } elsif ($origip =~ /^ (\d{1,3} \. \d{1,3}) \. \d{1,3} \. \d{1,3} $/xs) {
> - my $mask_len = $self->{ipv4_mask_len};
> + my $mask_len = $self->{conf}->{txrep_ipv4_mask_len};
> $mask_len = 16 if !defined $mask_len;
> # handle the default and easy cases manually
> if ($mask_len == 32) {$result = $origip;}
> @@ -1757,7 +1757,7 @@
> $origip =~
> /^ [0-9a-f]{0,4} (?: : [0-9a-f]{0,4} | \. [0-9]{1,3} ){2,9}
> $/xsi) {
> # looks like an IPv6 address
> - my $mask_len = $self->{ipv6_mask_len};
> + my $mask_len = $self->{conf}->{txrep_ipv6_mask_len};
> $mask_len = 48 if !defined $mask_len;
> my $origip_obj = NetAddr::IP->new6($origip . '/' . $mask_len);
> if (!defined $origip_obj) { # invalid IPv6
> address
>
>
>
>
