From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 3 Jul 2015 13:44:00 +0000 (+0100)
Subject: Ignore User header in SA mode.
X-Git-Tag: 0.9.9~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e708a474715a8ed7dae7b38c64928dc8f53f9b2;p=thirdparty%2Frspamd.git

Ignore User header in SA mode.
---

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index a0c824bc97..d880b62297 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -391,7 +391,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 &&