diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-04-25 10:43:07 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-04-25 10:44:18 +0100 |
| commit | d21fdd376f883510ae2bf5de7307eb59d84cb614 (patch) | |
| tree | bcc09218952f1b97d84c93137c3eb8171a781605 | |
| parent | cf52b4f1cee94112a58e36c076ea7004cb290c87 (diff) | |
| download | rspamd-d21fdd376f883510ae2bf5de7307eb59d84cb614.tar.gz rspamd-d21fdd376f883510ae2bf5de7307eb59d84cb614.zip | |
[Fix] Fix setting of email address
| -rw-r--r-- | rules/misc.lua | 4 | ||||
| -rw-r--r-- | src/lua/lua_task.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/rules/misc.lua b/rules/misc.lua index 20505828b..ccc52d887 100644 --- a/rules/misc.lua +++ b/rules/misc.lua @@ -415,8 +415,8 @@ local aliases_id = rspamd_config:register_symbol{ addr.addr = string.format('%s@', addr.user) end - if addr.name then - addr.raw = string.format('%s <%s>', addr.name, addr.addr) + if addr.name and #addr.name > 0 then + addr.raw = string.format('"%s" <%s>', addr.name, addr.addr) else addr.raw = string.format('<%s>', addr.addr) end diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c index 2ed2419e2..9edfd39d4 100644 --- a/src/lua/lua_task.c +++ b/src/lua/lua_task.c @@ -2076,7 +2076,7 @@ lua_import_email_address (lua_State *L, struct rspamd_task *task, p = lua_tolstring (L, -1, &len); addr->name = (const gchar *)rspamd_mempool_alloc (task->task_pool, len); memcpy ((gchar *)addr->name, p, len); - addr->addr_len = len; + addr->name_len = len; } lua_pop (L, 1); @@ -2152,6 +2152,7 @@ lua_import_email_address (lua_State *L, struct rspamd_task *task, } lua_pop (L, 1); + addr->flags = RSPAMD_EMAIL_ADDR_VALID; *paddr = addr; |