From d45e6b1c225e6453bdd3cfc32f6f86106947e365 Mon Sep 17 00:00:00 2001
From: youtous <contact@youtous.me>
Date: Thu, 30 Apr 2020 12:05:36 +0200
Subject: [PATCH] #fix 1478

---
 target/start-mailserver.sh | 13 ++++++++-----
 test/mail_with_ldap.bats   |  5 +++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index b0cb77e4..f5c779f4 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -637,6 +637,9 @@ function _setup_dovecot_quota() {
     if [ "$ENABLE_LDAP" = 1 ]; then
       notify 'inf' "Dovecot quota is not implemented with LDAP."
 
+      # LDAP => postfix service for dovecot quota not enabled
+      sed -i "s/check_policy_service inet:localhost:65265//g" /etc/postfix/main.cf
+
       if [ -f /etc/dovecot/conf.d/90-quota.conf ]; then
         mv /etc/dovecot/conf.d/90-quota.conf /etc/dovecot/conf.d/90-quota.conf.disab
         sed -i "s/mail_plugins = \$mail_plugins quota/mail_plugins = \$mail_plugins/g" /etc/dovecot/conf.d/10-mail.conf
@@ -659,12 +662,12 @@ function _setup_dovecot_quota() {
         notify 'inf' "'config/docker-mailserver/dovecot-quotas.cf' is not provided. Using default quotas."
 		    echo -n >/tmp/docker-mailserver/dovecot-quotas.cf
       fi
-    fi
 
-    if [ "$SMTP_ONLY" = 1 ]; then
-      sed -i "s/check_policy_service inet:localhost:65265//g" /etc/postfix/main.cf
-    else
-      sed -i "s/reject_unknown_recipient_domain, reject_rbl_client zen.spamhaus.org/reject_unknown_recipient_domain, check_policy_service inet:localhost:65265, reject_rbl_client zen.spamhaus.org/g" /etc/postfix/main.cf
+      if [ "$SMTP_ONLY" = 1 ]; then
+        sed -i "s/check_policy_service inet:localhost:65265//g" /etc/postfix/main.cf
+      else
+        sed -i "s/reject_unknown_recipient_domain, reject_rbl_client zen.spamhaus.org/reject_unknown_recipient_domain, check_policy_service inet:localhost:65265, reject_rbl_client zen.spamhaus.org/g" /etc/postfix/main.cf
+      fi
     fi
 }
 
diff --git a/test/mail_with_ldap.bats b/test/mail_with_ldap.bats
index 10e430fb..a236035c 100644
--- a/test/mail_with_ldap.bats
+++ b/test/mail_with_ldap.bats
@@ -179,6 +179,11 @@ function teardown_file() {
  assert_success
 }
 
+@test "checking postfix: dovecot quota absent in postconf" {
+  run docker exec mail_with_ldap /bin/bash -c "postconf | grep 'check_policy_service inet:localhost:65265'"
+  assert_failure
+}
+
 @test "checking spoofing: rejects sender forging" {
   run docker exec mail_with_ldap /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/auth/ldap-smtp-auth-spoofed.txt | grep 'Sender address rejected: not owned by user'"
   assert_success