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: 1.0.0~445
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2002d2d2e38adae9978025c26d1ed3a11a8c50e;p=thirdparty%2Frspamd.git

Ignore User header in SA mode.
---

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 6803353e4c..45b720383c 100644
--- 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 &&