From 1a4b6119cc54de171df5592786fec4a880da0517 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 27 Jan 2004 19:49:53 +0000 Subject: Ignore tabs in list parsing, and beautify smtpd_recipient_restrictions. --- postfix/postfix.sh | 4 ++-- postfix/smtpd_recipient_restrictions | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'postfix') diff --git a/postfix/postfix.sh b/postfix/postfix.sh index b4aaa95..53bb63f 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -3,7 +3,7 @@ # /etc/local-COMMON/postfix/postfix.sh # Copyright 2002-2003 Jonas Smedegaard # -# $Id: postfix.sh,v 1.22 2003-07-20 20:16:18 jonas Exp $ +# $Id: postfix.sh,v 1.23 2004-01-27 19:49:53 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -27,7 +27,7 @@ fi function getlinesfromfile() { param="$1" echo -n "$param = " - cat $paramdir/$param | grep -v '^#' | sed 's/#.*//' | tr '\n' ',' | sed -e 's/^[, ]*//' -e 's/[, ]\+/,/g' -e 's/,$//' + cat $paramdir/$param | grep -v '^#' | sed 's/#.*//' | tr '\n' ',' | sed -e 's/^[, ]*//' -e 's/[, ]\+/,/g' -e 's/,$//' } # Some badly configured setup use hostname instead of FQDN diff --git a/postfix/smtpd_recipient_restrictions b/postfix/smtpd_recipient_restrictions index 04ece8a..d919d7e 100644 --- a/postfix/smtpd_recipient_restrictions +++ b/postfix/smtpd_recipient_restrictions @@ -3,20 +3,20 @@ # # Used by tweak script postfix.sh # -# $Id: smtpd_recipient_restrictions,v 1.4 2002-12-31 13:38:42 jonas Exp $ +# $Id: smtpd_recipient_restrictions,v 1.5 2004-01-27 19:49:53 jonas Exp $ # reject_invalid_hostname -permit_mynetworks # Move this below FQDN-checks on a "true mailhub" - some Debian daemons send to localhost -permit_sasl_authenticated # Silently ignored if TLS not in use +permit_mynetworks # Move this below FQDN-checks on a "true mailhub" - some Debian daemons send to localhost +permit_sasl_authenticated # Silently ignored if TLS not in use reject_non_fqdn_hostname reject_non_fqdn_sender reject_non_fqdn_recipient reject_unknown_sender_domain reject_unknown_recipient_domain reject_unauth_pipelining -#permit_mynetworks # Moved to top to allow Debian daemons sending to localhost +#permit_mynetworks # Moved to top to allow Debian daemons sending to localhost permit_mx_backup reject_unauth_destination reject_maps_rbl -reject # Not really needed, but just to be on the safe side... +reject # Not really needed, but just to be on the safe side... -- cgit v1.2.3