Skip to content

Commit 25db574

Browse files
author
Alexander Krotov
committed
Print socket security in try_{imap,smtp}_one_param
1 parent 1c5a932 commit 25db574

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

src/configure/mod.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -535,12 +535,13 @@ async fn try_imap_usernames(
535535

536536
async fn try_imap_one_param(context: &Context, param: &LoginParam, imap: &mut Imap) -> Result<()> {
537537
let inf = format!(
538-
"imap: {}@{}:{} flags=0x{:x} certificate_checks={}",
538+
"imap: {}@{}:{} security={} certificate_checks={} flags=0x{:x}",
539539
param.mail_user,
540540
param.mail_server,
541541
param.mail_port,
542+
param.mail_security,
543+
param.imap_certificate_checks,
542544
param.server_flags,
543-
param.imap_certificate_checks
544545
);
545546
info!(context, "Trying: {}", inf);
546547

@@ -651,8 +652,13 @@ async fn try_smtp_usernames(
651652

652653
async fn try_smtp_one_param(context: &Context, param: &LoginParam, smtp: &mut Smtp) -> Result<()> {
653654
let inf = format!(
654-
"smtp: {}@{}:{} flags: 0x{:x}",
655-
param.send_user, param.send_server, param.send_port, param.server_flags
655+
"smtp: {}@{}:{} security={} certificate_checks={} flags=0x{:x}",
656+
param.send_user,
657+
param.send_server,
658+
param.send_port,
659+
param.send_security,
660+
param.smtp_certificate_checks,
661+
param.server_flags
656662
);
657663
info!(context, "Trying: {}", inf);
658664

src/provider/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ use crate::{
99
provider::data::PROVIDER_DATA,
1010
};
1111

12-
#[derive(Debug, Copy, Clone, PartialEq, FromPrimitive, ToPrimitive)]
12+
#[derive(Debug, Display, Copy, Clone, PartialEq, FromPrimitive, ToPrimitive)]
1313
#[repr(u8)]
1414
pub enum Status {
1515
OK = 1,
1616
PREPARATION = 2,
1717
BROKEN = 3,
1818
}
1919

20-
#[derive(Debug, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
20+
#[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
2121
#[repr(u8)]
2222
pub enum Protocol {
2323
SMTP = 1,
2424
IMAP = 2,
2525
}
2626

27-
#[derive(Debug, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
27+
#[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
2828
#[repr(u8)]
2929
pub enum Socket {
3030
Automatic = 0,

0 commit comments

Comments
 (0)