diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2006-09-24 05:58:00 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2006-09-24 05:58:00 +0000 |
| commit | f4614338004155fc1951e880b9bf99c7f781728f (patch) | |
| tree | 7437f7542e7b282d48222163840d52840f5d3a5b /postfix | |
| parent | 5d574af331fcef9154bc1b8b66a8a6855c0868f2 (diff) | |
Use ^ (not $) as space marker.
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 4 | ||||
| -rw-r--r-- | postfix/smtpd_recipient_restrictions | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index c04d773..6d197c0 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -3,7 +3,7 @@ # /etc/local-COMMON/postfix/postfix.sh # Copyright 2002-2004 Jonas Smedegaard <dr@jones.dk> # -# $Id: postfix.sh,v 1.32 2006-08-29 20:57:52 jonas Exp $ +# $Id: postfix.sh,v 1.33 2006-09-24 05:58:00 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -88,7 +88,7 @@ function getlinesfromfile() { replacements="$replacements;s/$oldparam/$newstring/" done echo -n "$param = " - cat $paramdir/$param | grep -v '^#' | sed 's/#.*//' | tr '\n' ',' | sed -e 's/^[, ]*//;s/[, ]\+/,/g' -e 's/\$/ /g' -e "s/,\$//$replacements" + cat $paramdir/$param | grep -v '^#' | sed 's/#.*//' | tr '\n' ',' | sed -e 's/^[, ]*//;s/[, ]\+/,/g' -e 's/\^/ /g' -e "s/,\$//$replacements" } # Inspired by D. J. Bernstein: http://cr.yp.to/smtp/greeting.html diff --git a/postfix/smtpd_recipient_restrictions b/postfix/smtpd_recipient_restrictions index e1a1071..b358599 100644 --- a/postfix/smtpd_recipient_restrictions +++ b/postfix/smtpd_recipient_restrictions @@ -3,7 +3,7 @@ # # Used by tweak script postfix.sh # -# $Id: smtpd_recipient_restrictions,v 1.9 2006-09-24 05:53:12 jonas Exp $ +# $Id: smtpd_recipient_restrictions,v 1.10 2006-09-24 05:58:00 jonas Exp $ # reject_unlisted_recipient # This one works only with postfix 2.1 and newer @@ -13,6 +13,6 @@ permit_sasl_authenticated # Silently ignored if TLS not in use reject_non_fqdn_recipient permit_mx_backup reject_unauth_destination -check_policy_service$inet:127.0.0.1:60000 # Activate greylisting (if installed on system, else fail!) +check_policy_service^inet:127.0.0.1:60000 # Activate greylisting (if installed on system, else fail!) reject_maps_rbl # Activate Realtime Blackhole Lists (with Postfix 2.x, expanded to content of file maps_rbl_domains) permit |