From 915c1ac982926c6688472b4246e4207c74430c44 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 2 Oct 2018 22:48:04 +0100
Subject: [PATCH] Wildcards don't appear to work

---
 src/freedombone-base-email | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 8c409cdc5..ce43e4fa5 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1042,14 +1042,6 @@ function email_smtp_proxy_through_isp {
         if [ ! "$isp_smtp_password" ]; then
             return
         fi
-        if [[ "$isp_smtp_domain" == 'mail.'* ]]; then
-            # shellcheck disable=SC2001
-            isp_smtp_domain=$(echo "$isp_smtp_domain" | sed 's|mail.|*.|g')
-        fi
-        if [[ "$isp_smtp_domain" == 'smtp.'* ]]; then
-            # shellcheck disable=SC2001
-            isp_smtp_domain=$(echo "$isp_smtp_domain" | sed 's|smtp.|*.|g')
-        fi
         { echo '# password file used when the local exim is authenticating to a remote';
           echo '# host as a client.';
           echo '#';
@@ -1069,6 +1061,9 @@ function email_smtp_proxy_through_isp {
 
     sed -i "s|dc_use_split_config=.*|dc_use_split_config='true'|g" /etc/exim4/update-exim4.conf.conf
 
+    chown root:Debian-exim /etc/exim4/passwd.client
+    chmod 640 /etc/exim4/passwd.client
+
     update-exim4.conf.template -r
     update-exim4.conf
     dpkg-reconfigure --frontend noninteractive exim4-config
-- 
GitLab