Merge pull request #4479 from bdukes/starttls

Automatically handle TLS negotiation for MailKit
dnnsoftware · Feb 10, 2021 · 739cf92 · 739cf92
2 parents d855265 + bedbc0d
commit 739cf92
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/DNN Platform/Library/Services/Mail/MailKitMailProvider.cs b/DNN Platform/Library/Services/Mail/MailKitMailProvider.cs
@@ -11,7 +11,8 @@ namespace DotNetNuke.Services.Mail
     using DotNetNuke.Entities.Host;
     using DotNetNuke.Entities.Portals;
 
-    using MailKit.Net.Smtp;
+    using MailKit.Net.Smtp;
+    using MailKit.Security;
 
     using MimeKit;
 
@@ -155,7 +156,7 @@ public override string SendMail(MailInfo mailInfo, SmtpInfo smtpInfo = null)
                 // to workaround problem in 4.0 need to specify host name
                 using (var smtpClient = new SmtpClient())
                 {
-                    smtpClient.Connect(host, port, smtpInfo.EnableSSL);
+                    smtpClient.Connect(host, port, SecureSocketOptions.Auto);
 
                     switch (smtpInfo.Authentication)
                     {