From b53b522b5285e1e9089ba4fb922e9e7fc484ffc5 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Wed, 28 Feb 2024 10:08:09 +0100 Subject: [PATCH] dkim: rephrase signing-domain source docs mostly to mention the 2 terms RFC5321.MailFrom and RFC5322.From actually used in the dmarc-rfc for both terms. additionally rephrase the link phrase from smtp_rfc to rfc_5321 (there are at least 3 rfcs titled SMTP) fix 1 small typo. Signed-off-by: Stoiko Ivanov --- asciidoc/asciidoc-pmg.conf | 2 +- pmgconfig.adoc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/asciidoc/asciidoc-pmg.conf b/asciidoc/asciidoc-pmg.conf index 6c9f0bb..82db85c 100644 --- a/asciidoc/asciidoc-pmg.conf +++ b/asciidoc/asciidoc-pmg.conf @@ -21,7 +21,7 @@ clamav=https://www.clamav.net[ClamAV(R)] debian=https://www.debian.org[Debian] debian_nonfree_archive_area=https://www.debian.org/doc/debian-policy/ch-archive#the-non-free-archive-area[Debian's non-free archive area] tts=http://www.template-toolkit.org[Template Toolkit] -smtp_rfc=https://tools.ietf.org/html/rfc5321[RFC 5321] +rfc_5321=https://tools.ietf.org/html/rfc5321[RFC 5321] rfc_5322=https://tools.ietf.org/html/rfc5322[RFC 5322] dkim_rfc=https://tools.ietf.org/html/rfc6376[RFC 6376] dmarc_rfc=https://tools.ietf.org/html/rfc7489[RFC 7489] diff --git a/pmgconfig.adoc b/pmgconfig.adoc index 8035923..a9377c5 100644 --- a/pmgconfig.adoc +++ b/pmgconfig.adoc @@ -588,10 +588,11 @@ otherwise. Select Signing Domain:: Determines whether to DKIM sign emails using the domain found in the envelope -from or the from header in the body of the email. The envelope from is also -known as reverse-path, see {smtp_rfc} section 3.3 and {rfc_5322} section 3.6.2. +from or the from header of the email. The envelope from is also known as +reverse-path and RFC5321.MailFrom (see {rfc_5321} section 3.3). +The from header is also known as RFC5322.From (see {rfc_5322} section 3.6.2). + -The envelop from of certain emails, bounces for example, can be empty. In these +The envelope from of certain emails, bounces for example, can be empty. In these cases it is desirable to sign them using the domain found in the from header. + Additionally, DMARC (see {dmarc_rfc} section 3.1.1) needs the domain found in