debian/postfwd
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge tag 'upstream/1.18'

Browse source 
Upstream version 1.18
This commit is contained in:
Jan Wagner 2013-11-05 17:33:16 +01:00
parent 0c9c44d39f 80611ddc0e
commit a01d770de1
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/CHANGELOG
View file

@ -1,9 +1,14 @@
1.18
=====
- bugfix: Fixed bug when comparing sender and recipient addresses, like
"sender=$$recipient". This affects only postfwd version 1.17.
1.17 1.17
===== =====
- bugfix: Invalid characters in variable substitutions were not correctly catched when - bugfix: Invalid characters in variable substitutions were not correctly catched when
the '=' operator was used, like "client_name=$$helo_name". If you can not the '=' operator was used, like "client_name=$$helo_name". If you can not
upgrade for some reason change your rule to "client_name=~$$helo_name" upgrade for some reason change your rule to "client_name=~$$helo_name"
- code: Net::DNS internal errors will now be handled gracefully - code: Net::DNS errors will now be handled gracefully
- code: default for options --dns_max_ns_a_lookups and --dns_max_mx_a_lookups of 100 - code: default for options --dns_max_ns_a_lookups and --dns_max_mx_a_lookups of 100
1.16 1.16

4
sbin/postfwd
View file

@ -25,7 +25,7 @@ use vars qw(@ISA);
# Program constants # Program constants
our($NAME) = 'postfwd'; our($NAME) = 'postfwd';
our($VERSION) = '1.17'; our($VERSION) = '1.18';
# Networking options (use -i, -p and -R to change) # Networking options (use -i, -p and -R to change)
our($def_net_pid) = "/var/run/".$NAME.".pid"; our($def_net_pid) = "/var/run/".$NAME.".pid";
@ -1471,7 +1471,7 @@ sub compare_item {
next ITEM unless $val; next ITEM unless $val;
# substitute check for $$vars in rule item # substitute check for $$vars in rule item
if ( $var = devar_item ($cmp,$val,$myitem,%request) ) { if ( $var = devar_item ($cmp,$val,$myitem,%request) ) {
$val = $var; $val =~ s/([^-_\.\w\s])/\\$1/g; $val = $var; $val =~ s/([^-_@\.\w\s])/\\$1/g unless ($cmp eq '==');
}; };
$myresult = &{$postfwd_compare{$postfwd_compare_proc}}($cmp,$val,$myitem,%request); $myresult = &{$postfwd_compare{$postfwd_compare_proc}}($cmp,$val,$myitem,%request);
mylogs $syslog_priority, "match $mykey: ".($myresult ? "TRUE" : "FALSE") if ($opt_verbose > 1); mylogs $syslog_priority, "match $mykey: ".($myresult ? "TRUE" : "FALSE") if ($opt_verbose > 1);