Skip to content

Bug 1994 - DMARC is not using synthesized SPF sender domain for NULL sender #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bug 1994 - DMARC is not using synthesized SPF sender domain for NULL sender #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53098fc
Merge pull request #1 from Exim/master
alexkiro Dec 14, 2016
8f254c8
Resolve not using synthesized SPF sender domain in DMARC.
alexkiro Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/src/dmarc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,19 +273,20 @@ if (!dmarc_abort && !sender_host_authenticated)
{
/* Use the envelope sender domain for this part of DMARC */
spf_sender_domain = expand_string(US"$sender_address_domain");
/* No spf domain means null envelope sender so generate a domain name
* from the sender_helo_name */
if (!*spf_sender_domain)
{
spf_sender_domain = sender_helo_name;
log_write(0, LOG_MAIN, "DMARC using synthesized SPF sender domain = %s\n",
spf_sender_domain);
DEBUG(D_receive)
debug_printf("DMARC using synthesized SPF sender domain = %s\n",
spf_sender_domain);
}

if (!spf_response)
{
/* No spf data means null envelope sender so generate a domain name
* from the sender_helo_name */
if (!spf_sender_domain)
{
spf_sender_domain = sender_helo_name;
log_write(0, LOG_MAIN, "DMARC using synthesized SPF sender domain = %s\n",
spf_sender_domain);
DEBUG(D_receive)
debug_printf("DMARC using synthesized SPF sender domain = %s\n",
spf_sender_domain);
}
dmarc_spf_result = DMARC_POLICY_SPF_OUTCOME_NONE;
dmarc_spf_ares_result = ARES_RESULT_UNKNOWN;
origin = DMARC_POLICY_SPF_ORIGIN_HELO;
Expand Down