filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Include server hostname in SMTP greetings (closes #448)

Browse Source
This commit is contained in:
mdecimus
2024-05-20 16:15:32 +02:00
parent d8140dd0e1
commit faf34ecde2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/common/src/config/smtp/session.rs
View File

@@ -566,7 +566,7 @@ impl Default for SessionConfig {
greeting: IfBlock::new::<()>(
"session.connect.greeting",
[],
"'Stalwart ESMTP at your service'",
"key_get('default', 'hostname') + ' Stalwart ESMTP at your service'",
),
},
ehlo: Ehlo {

4
crates/smtp/src/outbound/session.rs
View File

@@ -225,7 +225,7 @@ impl Message {
if params.is_smtp {
// Handle SMTP response
match read_smtp_data_respone(&mut smtp_client, params.hostname, &bdat_cmd).await {
match read_smtp_data_response(&mut smtp_client, params.hostname, &bdat_cmd).await {
Ok(response) => {
// Mark recipients as delivered
if response.code() == 250 {
@@ -485,7 +485,7 @@ pub async fn read_greeting<T: AsyncRead + AsyncWrite + Unpin>(
.map_err(|err| Status::from_smtp_error(hostname, "", err))
}
pub async fn read_smtp_data_respone<T: AsyncRead + AsyncWrite + Unpin>(
pub async fn read_smtp_data_response<T: AsyncRead + AsyncWrite + Unpin>(
smtp_client: &mut SmtpClient<T>,
hostname: &str,
bdat_cmd: &Option<String>,