Skip to content

Commit

Permalink
Update dmarc.lua
Browse files Browse the repository at this point in the history
With name:

dmarc; dmarc.lua:191: munging debug: {[domain] = domain.tld [flags] = {[valid] = true, [braced] = true}, [name] = Name [domain.tld], [raw] = <user@domain.tld>, [addr] = user@domain.tld, [user] = user}

dmarc; dmarc.lua:234: munged DMARC header for domain.tld: Name [domain.tld] via mark <otheruser@otherdomain.tld> -> user@domain.tld

Without name:
dmarc; dmarc.lua:191: munging debug: {[domain] = domain.tld [flags] = {[valid] = true, [braced] = true}, [name] = , [raw] = <user@domain.tld>, [addr] = user@domain.tld, [user] = user}

dmarc.lua:234: munged DMARC header for domain.tld: user via otheruser <otheruser@otherdomain.tld> -> user@domain.tld
  • Loading branch information
dzjaivnt committed Oct 12, 2023
1 parent 4127a61 commit 494078b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lualib/plugins/dmarc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ exports.gen_munging_callback = function(munging_opts, settings)
local via_addr = rcpt_found.addr
local via_name

if from.name != "" then
via_name = string.format('%s via %s', from.name, via_user)
else
if from.name == "" then
via_name = string.format('%s via %s', from.user or 'unknown', via_user)
else
via_name = string.format('%s via %s', from.name, via_user)
end

local hdr_encoded = rspamd_util.fold_header('From',
Expand Down

0 comments on commit 494078b

Please sign in to comment.