From d9a3904454980dd10f5fddd973e254ab138764b6 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 16 Aug 2011 02:56:16 +0200
Subject: Bug 466419: Add SSL support for SMTP r/a=mkanat

---
 Bugzilla/Config/Common.pm | 10 +++++++++-
 Bugzilla/Config/MTA.pm    |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Config')

diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index 9fffe02ee..17505079f 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -51,7 +51,7 @@ use base qw(Exporter);
        check_user_verify_class
        check_mail_delivery_method check_notification check_utf8
        check_bug_status check_smtp_auth check_theschwartz_available
-       check_maxattachmentsize check_email
+       check_maxattachmentsize check_email check_smtp_ssl
 );
 
 # Checking functions for the various values
@@ -350,6 +350,14 @@ sub check_smtp_auth {
     return "";
 }
 
+sub check_smtp_ssl {
+    my $use_ssl = shift;
+    if ($use_ssl && !Bugzilla->feature('smtp_ssl')) {
+        return "SSL support is not available. Run checksetup.pl for more details";
+    }
+    return "";
+}
+
 sub check_theschwartz_available {
     my $use_queue = shift;
     if ($use_queue && !Bugzilla->feature('jobqueue')) {
diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index c90e5dc76..b9b25bc6f 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -80,6 +80,12 @@ sub get_param_list {
    type => 'p',
    default => ''
   },
+  {
+   name => 'smtp_ssl',
+   type => 'b',
+   default => 0,
+   checker => \&check_smtp_ssl
+  },
   {
    name => 'smtp_debug',
    type => 'b',
-- 
cgit v1.2.3-24-g4f1b