From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Tue, 19 Jun 2012 17:10:44 +0000 (+0400)
Subject: Log smtp FROM in urls output if smtp user is not defined.
X-Git-Tag: 0.5.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=932b1315504b5c2b700742d508f09bacbc6043fc;p=thirdparty%2Frspamd.git

Log smtp FROM in urls output if smtp user is not defined.
---

diff --git a/src/protocol.c b/src/protocol.c
index fc03acacbe..522b771361 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -694,7 +694,8 @@ urls_protocol_cb (gpointer key, gpointer value, gpointer ud)
 
 	if (cb->task->cfg->log_urls) {
 		msg_info ("<%s> URL: %s - %s: %s", cb->task->message_id, cb->task->user ?
-				cb->task->user : "unknown", inet_ntoa (cb->task->client_addr), struri (url));
+				cb->task->user : (cb->task->from ? cb->task->from : "unknown"),
+				inet_ntoa (cb->task->client_addr), struri (url));
 	}
 
 	return FALSE;