From 7121b8a875bbf4a8da5b425624f677b61d62e063 Mon Sep 17 00:00:00 2001
From: pablobae <soporte@pablobaenas.com>
Date: Thu, 14 Mar 2019 15:59:33 +0100
Subject: [PATCH] Dovecot is set as owner of several user's files even when
 dovecot is not installed.

This pull checks if dovecot user exists before set dovecot as owner. If dovecot user doesn't exist (dovecot is not installed), owner is assign to Exim user
---
 bin/v-add-mail-domain       | 7 ++++++-
 func/rebuild.sh             | 8 +++++++-
 upd/fix_exim_permissions.sh | 8 +++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain
index 6681035ff3..46e2d6fd84 100755
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@@ -109,7 +109,12 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 
     # Set ownership
     chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain
-    chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+    # Checking if dovecot user exists before set dovecot as owner. If dovecot user doesn't exist (dovecot is not installed), owner is assign to Exim user
+    if id "dovecot" >/dev/null 2>&1; then
+        chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+    else
+        chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+    fi
     chown $user:mail $HOMEDIR/$user/mail/$domain_idn
 fi
 
diff --git a/func/rebuild.sh b/func/rebuild.sh
index 9a1c0f473d..7364b0e8f5 100644
--- a/func/rebuild.sh
+++ b/func/rebuild.sh
@@ -525,7 +525,13 @@ rebuild_mail_domain_conf() {
         chmod 771 /etc/$MAIL_SYSTEM/domains/$domain_idn
         chmod 770 $HOMEDIR/$user/mail/$domain_idn
         chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain
-        chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+
+        # Checking if dovecot user exists before set dovecot as owner. If dovecot user doesn't exist (dovecot is not installed), owner is assign to Exim user
+        if id "dovecot" >/dev/null 2>&1; then
+            chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+        else
+            chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+        fi
         chown $user:mail $HOMEDIR/$user/mail/$domain_idn
     fi
 
diff --git a/upd/fix_exim_permissions.sh b/upd/fix_exim_permissions.sh
index 7eaefb0c2a..07ff0a909d 100755
--- a/upd/fix_exim_permissions.sh
+++ b/upd/fix_exim_permissions.sh
@@ -5,7 +5,13 @@ if [ -e "/etc/exim4/domains/" ]; then
         domain_link=$(readlink /etc/exim4/domains/$domain)
         chown Debian-exim:mail $domain_link
         chown Debian-exim:mail /etc/exim4/domains/$domain/*
-        chown dovecot:mail /etc/exim4/domains/$domain/passwd
+
+        # Checking if dovecot user exists before set dovecot as owner. If dovecot user doesn't exist (dovecot is not installed), owner is assign to Exim user
+        if id "dovecot" >/dev/null 2>&1; then
+            chown -R dovecot:mail /etc/exim4/domains/$domain/passwd
+        else
+            chown -R $MAIL_USER:mail /etc/exim4/domains/$domain/passwd
+        fi
     done
 fi