Skip to content
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.

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

Quote results in Authentication-Results if necessary #145

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion libopenarc/arc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3711,7 +3711,7 @@ arc_chain_custody_str(ARC_MESSAGE *msg, u_char *buf, size_t buflen)
kvset = msg->arc_sets[set].arcset_ams->hdr_data;
str = arc_param_get(kvset, "d");
(void) arc_dstring_printf(tmpbuf, "%s%s",
(set < msg->arc_nsets ? ":" : ""),
(set < msg->arc_nsets - 1 ? ":" : ""),
str);
}

Expand Down
14 changes: 12 additions & 2 deletions openarc/openarc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3851,14 +3851,24 @@ mlfi_eom(SMFICTX *ctx)

if (ipout != NULL)
{
_Bool quote = strchr(ipout, ':') != NULL;

arcf_dstring_printf(afc->mctx_tmpstr,
" smtp.remote-ip=%s", ipout);
" smtp.remote-ip=%s%s%s",
quote ? "\"" : "",
ipout,
quote ? "\"" : "");
}

if (conf->conf_finalreceiver && arcchainlen > 0)
{
_Bool quote = strchr(arcchainbuf, ':') != NULL;

arcf_dstring_printf(afc->mctx_tmpstr,
" arc.chain=%s", arcchainbuf);
" arc.chain=%s%s%s",
quote ? "\"" : "",
arcchainbuf,
quote ? "\"" : "");
}

if (arcf_insheader(ctx, 1, AUTHRESULTSHDR,
Expand Down