diff options
Diffstat (limited to 'postfix/postfix.sh')
-rwxr-xr-x | postfix/postfix.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 370570b..c04d773 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.31 2006-02-10 10:31:18 jonas Exp $ +# $Id: postfix.sh,v 1.32 2006-08-29 20:57:52 jonas Exp $ # # Auto-tweak plain installed postfix Debian package # @@ -36,6 +36,16 @@ else echo " (on Debian: install the package postfix-tls)" fi # FIXME: We really want to check for at least 2.1.1 but that's tricky... +postgrey= +if [ -x /usr/sbin/postgrey ]; then + # FIXME: Use this somehow, and only warn below + postgrey=1 +else + echo "ERROR: Greylisting support missing." + echo " (on Debian: install the package postgrey)" + exit 1 +fi +# FIXME: We really want to check for at least 2.1.1 but that's tricky... sasl2= if saslauthd -v 2>&1 | grep -q '^saslauthd 2.1'; then sasl2=1 @@ -78,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/,\$//$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 |