From d682d5fb35593488646e1a2b556fc7a725e98ce4 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Oct 16 2018 06:37:15 +0000
Subject: Fix multimail config with empty auth or disabled tls


Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/pagure/hooks/mail.py b/pagure/hooks/mail.py
index e207baa..f8615b2 100644
--- a/pagure/hooks/mail.py
+++ b/pagure/hooks/mail.py
@@ -95,15 +95,15 @@ class MailRunner(BaseRunner):
             "multimailhook.smtpServer", "", pagure_config["SMTP_SERVER"]
         )
         repo_obj.config.set_multivar(
-            "multimailhook.smtpUser", "", pagure_config["SMTP_USERNAME"]
+            "multimailhook.smtpUser", "", pagure_config["SMTP_USERNAME"] or ""
         )
         repo_obj.config.set_multivar(
-            "multimailhook.smtpPass", "", pagure_config["SMTP_PASSWORD"]
+            "multimailhook.smtpPass", "", pagure_config["SMTP_PASSWORD"] or ""
         )
         repo_obj.config.set_multivar(
             "multimailhook.smtpEncryption",
             "",
-            "tls" if pagure_config["SMTP_SSL"] else "",
+            "tls" if pagure_config["SMTP_SSL"] else "none",
         )
         repo_obj.config.set_multivar(
             "multimailhook.from", "", pagure_config["FROM_EMAIL"]