From f41a98b7f4e0c85491aabdfcd649b771fa042161 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 17 Nov 2016 14:48:24 +0100
Subject: Fix detect postfix >= 3, and stop check for obsolete postfix < 2.2.

---
 postfix/postfix.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/postfix/postfix.sh b/postfix/postfix.sh
index bd62e8b..2aca3e7 100755
--- a/postfix/postfix.sh
+++ b/postfix/postfix.sh
@@ -44,11 +44,7 @@ configdirs='/etc/local /etc/local-ORG /etc/local-REDPILL /etc/local-COMMON'
 confdir='/etc/postfix'
 postconf=/usr/sbin/postconf
 sp='[[:space:]]'
-pfver="$($postconf -d mail_version | cut -d= -f2 -s)"
-echo "$pfver" | grep -qP '2\.([2-9]|1\d)(\.\d)?$' \
-	|| exit1 "ERROR: Bad postfix version - this script is known to work only for postfix 2.2 and later"
-pf23=
-! echo "$pfver" | grep -qP '2\.([3-9]|1\d)(\.\d)?$' || pf23=1
+pf23="$($postconf -d mail_version | grep -Po '= \K([3-9]|2\.[3-9])(\.[0-9])*$')"
 if ! [ -d "$realmsdir" ]; then
 	warn "Realms directory \"$realmsdir\" does not exist."
 fi
-- 
cgit v1.2.3