diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2020-10-08 12:41:08 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2020-10-08 12:41:08 +0200 |
| commit | 34e9559d1586110a969f13c96b06e75b9063fe78 (patch) | |
| tree | df1f197c4cd4135b40611e4ac2ea5358fb3efd9a /postfix | |
| parent | 158ce1e4ba9fc52a12cdf6726bb85099c60708ab (diff) | |
stop support postfix << 2.3
Diffstat (limited to 'postfix')
| -rwxr-xr-x | postfix/postfix.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/postfix/postfix.sh b/postfix/postfix.sh index 9ac1d0e..a328986 100755 --- a/postfix/postfix.sh +++ b/postfix/postfix.sh @@ -44,7 +44,6 @@ configdirs='/etc/local /etc/local-ORG /etc/local-REDPILL /etc/local-COMMON' confdir='/etc/postfix' postconf=/usr/sbin/postconf sp='[[:space:]]' -pf23="$($postconf -d mail_version | grep -Po '= \K([3-9]|2\.([3-9]|1\d+))(\.[0-9])*$')" if ! [ -d "$realmsdir" ]; then warn "Realms directory \"$realmsdir\" does not exist." fi @@ -93,12 +92,8 @@ if [ -n "$sslcert" ]; then sasl_main_type=cyrus fi if [ -n "$dovecot" ]; then - if [ -n "$pf23" ]; then - sasl_dovecot=1 - sasl_main_type=dovecot - else - warn "No Dovecot SASL - requires postfix >= 2.3." - fi + sasl_dovecot=1 + sasl_main_type=dovecot fi if [ -z "$sasl_main_type" ]; then warn "No SASL authentication - requires Cyrus SASL or Dovecot." @@ -315,8 +310,7 @@ case "$sasl_main_type" in ;; cyrus) $postconf -c "$tempdir" -e smtpd_sasl_type=cyrus - [ -z "$pf23" ] || $postconf -c "$tempdir" -e smtpd_sasl_path=smtpd - [ -n "$pf23" ] || $postconf -c "$tempdir" -e smtpd_sasl_application_name=smtpd + $postconf -c "$tempdir" -e smtpd_sasl_path=smtpd ;; *) exit1 "ERROR: Wrong SASL type \"$sasl_main_type\"!";; esac |