From 7adcd3103504ea4aaf52987955e5012816546c98 Mon Sep 17 00:00:00 2001
From: fhloston <fhloston@users.noreply.github.com>
Date: Fri, 18 Sep 2020 12:17:11 +0200
Subject: [PATCH] =?UTF-8?q?Posfix:=20enable=20smtpd=5Fsasl=5Fauth=20when?=
 =?UTF-8?q?=20permit=5Fsasl=5Fauthenticated=20is=20sele=E2=80=A6=20(#1957)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mvc/app/controllers/OPNsense/Postfix/forms/general.xml    | 1 +
 .../src/opnsense/service/templates/OPNsense/Postfix/main.cf   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
index 008bd8eab..7c7648615 100644
--- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
+++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml
@@ -212,6 +212,7 @@
         <id>general.permit_sasl_authenticated</id>
         <label>Permit SASL Authenticated</label>
         <type>checkbox</type>
+        <help>Allow SASL authenticated senders to relay. Will also enable smtpd_sasl_auth.</help>
     </field>
     <field>
         <id>general.permit_tls_clientcerts</id>
diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
index 69f314b71..604fe9cc1 100644
--- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
+++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
@@ -116,6 +116,10 @@ smtp_sasl_password_maps = hash:/usr/local/etc/postfix/smtp_auth
 smtp_sasl_security_options =
 {% endif %}
 
+{% if helpers.exists('OPNsense.postfix.general.permit_sasl_authenticated') and OPNsense.postfix.general.permit_sasl_authenticated == '1' %}
+smtpd_sasl_auth_enable = yes
+{% endif %}
+
 {% if helpers.exists('OPNsense.postfix.antispam.enable_rspamd') and OPNsense.postfix.antispam.enable_rspamd == '1' %}
 smtpd_milters = inet:localhost:11332
 non_smtpd_milters = inet:localhost:11332