happyDomain/postfix-policyd-spf-perl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: happyDomain:master
Branches Tags
happyDomain:master
happyDomain:2.011
happyDomain:2.010
happyDomain:2.009
happyDomain:2.008
happyDomain:1.08
happyDomain:1.07
happyDomain:1.06
happyDomain:1.05
happyDomain:1.03
happyDomain:1.02
happyDomain:1.01
happyDomain:1.00
..
compare: happyDomain:2.011
Branches Tags
happyDomain:master
happyDomain:2.011
happyDomain:2.010
happyDomain:2.009
happyDomain:2.008
happyDomain:1.08
happyDomain:1.07
happyDomain:1.06
happyDomain:1.05
happyDomain:1.03
happyDomain:1.02
happyDomain:1.01
happyDomain:1.00

No commits in common. "master" and "2.011" have entirely different histories.
master ... 2.011

2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
postfix-policyd-spf-perl
View file

@ -348,8 +348,8 @@ sub sender_policy_framework {
); );
}; };
# Prepend header on HELO fail instead of rejecting. # Reject on HELO fail. Defer on HELO temperror if message would otherwise
# Use the HELO result and return for null sender. # be accepted. Use the HELO result and return for null sender.
if ($helo_result->is_code('fail')) { if ($helo_result->is_code('fail')) {
if ($VERBOSE) { if ($VERBOSE) {
syslog( syslog(
@ -358,8 +358,7 @@ sub sender_policy_framework {
$attr->{helo_name} || '<UNKNOWN>' $attr->{helo_name} || '<UNKNOWN>'
); );
}; };
return "PREPEND $helo_spf_header" return "550 $helo_authority_exp";
unless $cache->{added_spf_header}++;
} }
elsif ($helo_result->is_code('temperror')) { elsif ($helo_result->is_code('temperror')) {
if ($VERBOSE) { if ($VERBOSE) {
@ -369,8 +368,7 @@ sub sender_policy_framework {
$attr->{helo_name} || '<UNKNOWN>' $attr->{helo_name} || '<UNKNOWN>'
); );
}; };
return "PREPEND $helo_spf_header" return "DEFER_IF_PERMIT SPF-Result=$helo_local_exp";
unless $cache->{added_spf_header}++;
} }
elsif ($attr->{sender} eq '') { elsif ($attr->{sender} eq '') {
if ($VERBOSE) { if ($VERBOSE) {
@ -444,12 +442,10 @@ sub sender_policy_framework {
); );
}; };
if ($mfrom_result->is_code('fail')) { if ($mfrom_result->is_code('fail')) {
return "PREPEND $mfrom_spf_header" return "550 $mfrom_authority_exp";
unless $cache->{added_spf_header}++;
} }
elsif ($mfrom_result->is_code('temperror')) { elsif ($mfrom_result->is_code('temperror')) {
return "PREPEND $mfrom_spf_header" return "DEFER_IF_PERMIT SPF-Result=$mfrom_local_exp";
unless $cache->{added_spf_header}++;
} }
else { else {
return "PREPEND $mfrom_spf_header" return "PREPEND $mfrom_spf_header"

16
postfix-policyd-spf-perl.in
View file

@ -348,8 +348,8 @@ sub sender_policy_framework {
); );
}; };
# Prepend header on HELO fail instead of rejecting. # Reject on HELO fail. Defer on HELO temperror if message would otherwise
# Use the HELO result and return for null sender. # be accepted. Use the HELO result and return for null sender.
if ($helo_result->is_code('fail')) { if ($helo_result->is_code('fail')) {
if ($VERBOSE) { if ($VERBOSE) {
syslog( syslog(
@ -358,8 +358,7 @@ sub sender_policy_framework {
$attr->{helo_name} || '<UNKNOWN>' $attr->{helo_name} || '<UNKNOWN>'
); );
}; };
return "PREPEND $helo_spf_header" return "550 $helo_authority_exp";
unless $cache->{added_spf_header}++;
} }
elsif ($helo_result->is_code('temperror')) { elsif ($helo_result->is_code('temperror')) {
if ($VERBOSE) { if ($VERBOSE) {
@ -369,8 +368,7 @@ sub sender_policy_framework {
$attr->{helo_name} || '<UNKNOWN>' $attr->{helo_name} || '<UNKNOWN>'
); );
}; };
return "PREPEND $helo_spf_header" return "DEFER_IF_PERMIT SPF-Result=$helo_local_exp";
unless $cache->{added_spf_header}++;
} }
elsif ($attr->{sender} eq '') { elsif ($attr->{sender} eq '') {
if ($VERBOSE) { if ($VERBOSE) {
@ -444,12 +442,10 @@ sub sender_policy_framework {
); );
}; };
if ($mfrom_result->is_code('fail')) { if ($mfrom_result->is_code('fail')) {
return "PREPEND $mfrom_spf_header" return "550 $mfrom_authority_exp";
unless $cache->{added_spf_header}++;
} }
elsif ($mfrom_result->is_code('temperror')) { elsif ($mfrom_result->is_code('temperror')) {
return "PREPEND $mfrom_spf_header" return "DEFER_IF_PERMIT SPF-Result=$mfrom_local_exp";
unless $cache->{added_spf_header}++;
} }
else { else {
return "PREPEND $mfrom_spf_header" return "PREPEND $mfrom_spf_header"