Skip to content

Commit f3a5e1f

Browse files
committed
exch: update smtp out log message wording
1 parent d60c452 commit f3a5e1f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

exch/emsmdb/common_util.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,8 +1852,8 @@ BOOL common_util_send_mail(MAIL *pmail,
18521852
case SMTP_SEND_OK:
18531853
common_util_send_command(sockd, "quit\r\n", 6);
18541854
close(sockd);
1855-
log_err("emsmdb: succesfully sent mail %s -> SMTP [%s]:%hu",
1856-
sender, g_smtp_ip, g_smtp_port);
1855+
log_err("emsmdb: outgoing SMTP [%s]:%hu: from=<%s> OK",
1856+
g_smtp_ip, g_smtp_port, sender);
18571857
return TRUE;
18581858
}
18591859
return false;

exch/zcore/common_util.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,8 +1632,8 @@ static BOOL common_util_send_mail(MAIL *pmail,
16321632
case SMTP_SEND_OK:
16331633
common_util_send_command(sockd, "quit\r\n", 6);
16341634
close(sockd);
1635-
log_err("Succesfully sent %s -> SMTP [%s]:%hu",
1636-
sender, g_smtp_ip, g_smtp_port);
1635+
log_err("outgoing SMTP [%s]:%hu: from=<%s> OK",
1636+
g_smtp_ip, g_smtp_port, sender);
16371637
return TRUE;
16381638
}
16391639
return false;

exch/zcore/zarafa_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3415,7 +3415,7 @@ uint32_t zarafa_server_submitmessage(GUID hsession, uint32_t hmessage)
34153415
if ('\0' == username[0]) {
34163416
gx_strlcpy(username, account, GX_ARRAY_SIZE(username));
34173417
} else if (!common_util_check_delegate_permission_ex(account, username)) {
3418-
fprintf(stderr, "I-1334: store %s tried to send with from=%s, but no delegate permission.\n",
3418+
fprintf(stderr, "I-1334: uid %s tried to send with from=<%s>, but no delegate permission.\n",
34193419
account, username);
34203420
return ecAccessDenied;
34213421
}

0 commit comments

Comments
 (0)