*** auth_results.lua    2018-01-06 11:24:32.952945963 +0100
--- auth_results_patched.lua    2018-01-06 11:29:24.415299269 +0100
***************
*** 50,55 ****
--- 50,56 ----
      none = 'ARC_NA',
      reject = 'ARC_REJECT',
    },
+   add_smtp_user = true,
  }

  local exports = {}
***************
*** 172,181 ****
      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'])
      else
!       hdr = string.format('auth=pass smtp.auth=%s', u)
      end

      table.insert(hdr_parts, hdr)
--- 173,191 ----
      local hdr

      if #smtp_from[1]['addr'] > 0 then
!       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
!       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)