aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-12-07 09:31:07 +1300
committerGitHub <noreply@github.com>2016-12-07 09:31:07 +1300
commit9cbebefb5dd51130dd0856270643199777a30df6 (patch)
treee2c0684fed49a1789334083634b7fb980e11ef9e /src
parentae2612e060e390773cc49955ddc422a889abd2f5 (diff)
parent4a3115ab4311b1bd08d9b7180e907ee2253dac28 (diff)
downloadtrackermap-server-9cbebefb5dd51130dd0856270643199777a30df6.tar.gz
trackermap-server-9cbebefb5dd51130dd0856270643199777a30df6.tar.bz2
trackermap-server-9cbebefb5dd51130dd0856270643199777a30df6.zip
Merge pull request #2653 from Abyss777/mail_protocols
Add support for "mail.smtp.ssl.protocols" parameter
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/notification/NotificationMail.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index 17e4d6be4..90f6bd75e 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -61,6 +61,11 @@ public final class NotificationMail {
properties.put("mail.smtp.ssl.trust", sslTrust);
}
+ String sslProtocols = provider.getString("mail.smtp.ssl.protocols");
+ if (sslProtocols != null) {
+ properties.put("mail.smtp.ssl.protocols", sslProtocols);
+ }
+
properties.put("mail.smtp.auth", provider.getString("mail.smtp.auth"));
String username = provider.getString("mail.smtp.username");