Ignore User header in SA mode.

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 6803353e4c8b70c36aaaee8f24196df32da54b3d..45b720383c806fbe0da25af6413dffd65956c538 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -382,7 +382,13 @@ rspamd_protocol_handle_headers (struct rspamd_task *task,
                case 'u':
                case 'U':
                        if (g_ascii_strncasecmp (headern, USER_HEADER, hlen) == 0) {
-                               task->user = hv->str;
+                               /*
+                                * We must ignore User header in case of spamc, as SA has
+                                * different meaning of this header
+                                */
+                               if (!RSPAMD_TASK_IS_SPAMC (task)) {
+                                       task->user = hv->str;
+                               }
                        }
                        if (g_ascii_strncasecmp (headern, URLS_HEADER, hlen) == 0) {
                                if (h->value->len == sizeof ("extended") - 1 &&