diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-02-18 16:22:52 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-02-18 16:22:52 +0000 |
| commit | e34f8ca2022e340d3c0e36260a0232fab306dfcc (patch) | |
| tree | 0be7025e466defdb94c87cb4edd30dd7efcb46ce /src | |
| parent | c674e7a4885de9bbd87b89cad1a55ec935005ee0 (diff) | |
Expansions: make ${authresults } usable in a named ACL
This will be more common than directly in the acl_smtp_data option,
and suffers one less expansion in operation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/dkim.c | 2 | ||||
| -rw-r--r-- | src/src/expand.c | 6 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 2 | ||||
| -rw-r--r-- | src/src/spf.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/src/dkim.c b/src/src/dkim.c index 4fe4a11ab..ec5ba494b 100644 --- a/src/src/dkim.c +++ b/src/src/dkim.c @@ -803,7 +803,7 @@ pdkim_signature * sig; for (sig = dkim_signatures; sig; sig = sig->next) { - g = string_catn(g, US";\\n\\tdkim=", 10); + g = string_catn(g, US";\n\tdkim=", 8); if (sig->verify_status & PDKIM_VERIFY_POLICY) g = string_append(g, 5, diff --git a/src/src/expand.c b/src/src/expand.c index 44e8e1ba0..d49f943b0 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1666,11 +1666,11 @@ static gstring * authres_iprev(gstring * g) { if (sender_host_name) - return string_append(g, 3, US";\\n\\tiprev=pass (", sender_host_name, US")"); + return string_append(g, 3, US";\n\tiprev=pass (", sender_host_name, US")"); if (host_lookup_deferred) - return string_catn(g, US";\\n\\tiprev=temperror", 21); + return string_catn(g, US";\n\tiprev=temperror", 19); if (host_lookup_failed) - return string_catn(g, US";\\n\\tiprev=fail", 15); + return string_catn(g, US";\n\tiprev=fail", 13); return g; } diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 1b7df5c30..d804bc7d2 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -5751,7 +5751,7 @@ authres_smtpauth(gstring * g) if (!sender_host_authenticated) return g; -g = string_append(g, 4, US";\\n\\tauth=pass" +g = string_append(g, 4, US";\n\tauth=pass" " (", sender_host_authenticated, US") smtp.auth=", authenticated_id); if (authenticated_sender) g = string_append(g, 2, US" smtp.mailfrom=", authenticated_sender); diff --git a/src/src/spf.c b/src/src/spf.c index a2f93b0ce..12994a690 100644 --- a/src/src/spf.c +++ b/src/src/spf.c @@ -153,7 +153,7 @@ authres_spf(gstring * g) { if (!spf_result) return g; -return string_append(g, 4, US";\\n\\tspf=", spf_result, +return string_append(g, 4, US";\n\tspf=", spf_result, US" smtp.mailfrom=", expand_string(US"$sender_address_domain")); } |