Merge pull request ether#284 from absynce/master

Add TLS support to SMTP server configuration
fmarier · Jul 18, 2011 · fbb9287 · fbb9287
2 parents bd3b396 + d6f48ae
commit fbb9287
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/infrastructure/net.appjet.ajstdlib/ajstdlib.scala b/infrastructure/net.appjet.ajstdlib/ajstdlib.scala
@@ -217,6 +217,7 @@ object email {
         val debug = false;
 
         val props = new Properties;
+	props.put("mail.smtp.starttls.enable", config.smtpStartTls);
         props.put("mail.smtp.host", config.smtpServerHost);
         props.put("mail.smtp.port", config.smtpServerPort.toString());
         if (config.smtpUser != "")

diff --git a/infrastructure/net.appjet.oui/config.scala b/infrastructure/net.appjet.oui/config.scala
@@ -208,6 +208,9 @@ object config {
   @ConfigParam("password for authentication to mail server. Default: no authentication.")
               { val argName = "password" } 
   def smtpPass = stringOrElse("smtpPass", "");
+  @ConfigParam("true or false to use starttls (TLS authentication) when connecting to mail server. Default: false.")
+              { val argName = "smtpStartTls" }
+  def smtpStartTls = stringOrElse("smtpStartTls", "false");
 
   // comet
   @ConfigParam("prefix for all comet requests. Required to use Comet system.")