Fix SMTP: use starttls_relay for port 587, relay for 465
This commit is contained in:
parent
15d9e3c142
commit
8d3c28e441
1 changed files with 9 additions and 4 deletions
|
|
@ -223,12 +223,17 @@ log::info!("Testing SMTP connection to {}:{}", config.host, config.port);
|
||||||
|
|
||||||
let mailer_result = if let (Some(user), Some(pass)) = (config.username, config.password) {
|
let mailer_result = if let (Some(user), Some(pass)) = (config.username, config.password) {
|
||||||
let creds = Credentials::new(user, pass);
|
let creds = Credentials::new(user, pass);
|
||||||
|
if config.port == 465 {
|
||||||
SmtpTransport::relay(&config.host)
|
SmtpTransport::relay(&config.host)
|
||||||
.map(|b| b.port(config.port as u16).credentials(creds).build())
|
.map(|b| b.port(config.port as u16).credentials(creds).build())
|
||||||
} else {
|
} else {
|
||||||
Ok(SmtpTransport::builder_dangerous(&config.host)
|
SmtpTransport::starttls_relay(&config.host)
|
||||||
|
.map(|b| b.port(config.port as u16).credentials(creds).build())
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
SmtpTransport::builder_dangerous(&config.host)
|
||||||
.port(config.port as u16)
|
.port(config.port as u16)
|
||||||
.build())
|
.build()
|
||||||
};
|
};
|
||||||
|
|
||||||
match mailer_result {
|
match mailer_result {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue