]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
Log smtp FROM in urls output if smtp user is not defined.
authorVsevolod Stakhov <vsevolod@rambler-co.ru>
Tue, 19 Jun 2012 17:10:44 +0000 (21:10 +0400)
committerVsevolod Stakhov <vsevolod@rambler-co.ru>
Tue, 19 Jun 2012 17:10:44 +0000 (21:10 +0400)
src/protocol.c

index fc03acacbe1f352c7c04b3e6449980acbd452f9c..522b771361d1edfb7cedea8b979af936a87a4c25 100644 (file)
@@ -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;