From 34e9559d1586110a969f13c96b06e75b9063fe78 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 8 Oct 2020 12:41:08 +0200
Subject: stop support postfix << 2.3

---
 postfix/postfix.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'postfix')

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
-- 
cgit v1.2.3