Commit

Author: Mauro D [mauro@stalw.art]

Hash: 87a07fbf1f3161ea2809a839572f72e22d10655c

Timestamp: Thu, 19 Jan 2023 17:03:54 +0000 (1 year ago)

+2 -2 +/-2 browse

Fixed Auth-Results header.

1	diff --git a/Cargo.toml b/Cargo.toml
2	index 0595c70..7afcf4f 100644
3	--- a/Cargo.toml
4	+++ b/Cargo.toml
5	@@ -17,7 +17,7 @@ doctest = false
6
7	[dependencies]
8	mail-parser = { version = "0.8", git = "https://github.com/stalwartlabs/mail-parser", features = ["ludicrous_mode", "full_encoding"] }
9	- mail-builder = { version = "0.2.4", git = "https://github.com/stalwartlabs/mail-builder", features = ["ludicrous_mode"] }
10	+ mail-builder = { version = "0.2.5", git = "https://github.com/stalwartlabs/mail-builder", features = ["ludicrous_mode"] }
11	rsa = {version = "0.7.0"}
12	ed25519-dalek = "1.0.1"
13	sha1 = {version = "0.10", features = ["oid"]}
14	diff --git a/src/common/auth_results.rs b/src/common/auth_results.rs
15	index 7f740c4..710abac 100644
16	--- a/src/common/auth_results.rs
17	+++ b/src/common/auth_results.rs
18	@@ -123,7 +123,7 @@ impl<'x> AuthenticationResults<'x> {
19
20	pub fn with_dmarc_result(mut self, dmarc: &DmarcOutput) -> Self {
21	self.auth_results.push_str(";\r\n\tdmarc=");
22	- if dmarc.spf_result == DmarcResult::Pass || dmarc.dkim_result == DmarcResult::Pass {
23	+ if dmarc.spf_result == DmarcResult::Pass && dmarc.dkim_result == DmarcResult::Pass {
24	DmarcResult::Pass.as_auth_result(&mut self.auth_results);
25	} else if dmarc.spf_result != DmarcResult::None {
26	dmarc.spf_result.as_auth_result(&mut self.auth_results);