diff options
author | Jonas Smedegaard <dr@jones.dk> | 2003-03-22 19:23:44 +0000 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2003-03-22 19:23:44 +0000 |
commit | d7b20d1be31f3c88a46dcd8dfd6d861e29dd0171 (patch) | |
tree | 4dfdd25da821f7ef64934e7d44c4769d532513ed /postfix | |
parent | 91641edda58085ac300374562f16e74f8620ff1b (diff) |
Drop requiring strict EHLO. Add support for RHSBL (DNSBL) blackhole.
Diffstat (limited to 'postfix')
-rwxr-xr-x | postfix/postfix.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 79e8cb2..176a0b2 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -3,13 +3,10 @@ # /etc/local-COMMON/postfix/postfix.sh # Copyright 2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: postfix.sh,v 1.13 2003-03-18 11:14:29 jonas Exp $ +# $Id: postfix.sh,v 1.14 2003-03-22 19:23:44 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # -# TODO: Check for postfix 2.0 and include improve RBL logic with new -# options reject_rhsbl_sender and default_rbl_reply -# # TODO: Implement stuff from here: http://www.wsrcc.com/spam/ # # TODO: Figure out a way to use chroot jail for TLS stuff. @@ -32,9 +29,11 @@ function getlinesfromfile() { } # Some badly configured setup use hostname instead of FQDN -if $postconf myhostname | grep -q '\.'; then - $postconf -e 'smtpd_helo_required = yes' -fi +# Disable completely: Effective, but hurts executive type guys using windows servers... :-( +#if $postconf myhostname | grep -q '\.'; then +# $postconf -e 'smtpd_helo_required = yes' +#fi +$postconf -e 'smtpd_helo_required = no' $postconf -e "`getlinesfromfile permit_mx_backup_networks`" if [ "$pf2" ]; then rbl_domains="`getlinesfromfile maps_rbl_domains | sed -e 's/.*=[ ]*//' -e 's/,/ /g'`" @@ -45,6 +44,7 @@ if [ "$pf2" ]; then recipient_restrictions="`getlinesfromfile smtpd_recipient_restrictions | sed 's/.*=[ ]*//' | sed \"s/reject_maps_rbl/$rbl_domain_line/\"`" $postconf -e "maps_rbl_domains =" $postconf -e "smtpd_recipient_restrictions = $recipient_restrictions" + $postconf -e "smtpd_sender_restrictions = reject_rhsbl_sender dsn.rfc-ignorant.org" else $postconf -e "`getlinesfromfile maps_rbl_domains`" $postconf -e "`getlinesfromfile smtpd_recipient_restrictions`" |