diff options
| -rw-r--r-- | lualib/auth_results.lua | 16 | ||||
| -rw-r--r-- | src/plugins/lua/milter_headers.lua | 1 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lualib/auth_results.lua b/lualib/auth_results.lua index 5f4b2f896..4a36e618b 100644 --- a/lualib/auth_results.lua +++ b/lualib/auth_results.lua @@ -50,6 +50,7 @@ local default_settings = { none = 'ARC_NA', reject = 'ARC_REJECT', }, + add_smtp_user = true, } local exports = {} @@ -172,10 +173,19 @@ local function gen_auth_results(task, settings) local hdr if #smtp_from[1]['addr'] > 0 then - hdr = string.format('auth=pass smtp.auth=%s smtp.mailfrom=%s', - u, smtp_from[1]['addr']) + if settings['add_smtp_user'] then + hdr = string.format('auth=pass smtp.auth=%s smtp.mailfrom=%s', + u, smtp_from[1]['addr']) + else + hdr = string.format('auth=pass smtp.mailfrom=%s', + smtp_from[1]['addr']) + end else - hdr = string.format('auth=pass smtp.auth=%s', u) + if settings['add_smtp_user'] then + hdr = string.format('auth=pass smtp.auth=%s', u) + else + hdr = 'auth=pass' + end end table.insert(hdr_parts, hdr) diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua index 39cfb3298..2633d32f8 100644 --- a/src/plugins/lua/milter_headers.lua +++ b/src/plugins/lua/milter_headers.lua @@ -111,6 +111,7 @@ local settings = { softfail = 'DMARC_POLICY_SOFTFAIL', quarantine = 'DMARC_POLICY_QUARANTINE', }, + add_smtp_user = true, }, ['stat-signature'] = { header = 'X-Stat-Signature', |