summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rambler-co.ru>2012-06-19 21:10:44 +0400
committerVsevolod Stakhov <vsevolod@rambler-co.ru>2012-06-19 21:10:44 +0400
commit932b1315504b5c2b700742d508f09bacbc6043fc (patch)
treed9658a9cfbca9d88729c7f04a6fc39b21c003443
parent56b591bcb2c91ab8af7def656f115e2e794a2b8a (diff)
downloadrspamd-932b1315504b5c2b700742d508f09bacbc6043fc.tar.gz
rspamd-932b1315504b5c2b700742d508f09bacbc6043fc.zip
Log smtp FROM in urls output if smtp user is not defined.
-rw-r--r--src/protocol.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/protocol.c b/src/protocol.c
index fc03acacb..522b77136 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;