diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-08-18 15:00:07 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-08-18 15:00:07 +0100 |
| commit | 4b0b45c29baba61e43a546446be30a0ccdc1075f (patch) | |
| tree | d675aa17be70e956c33a60cbde6a3543e5075110 /src/libserver/protocol.c | |
| parent | 3f4624d24b2814242415e7cd87f94fb505b897aa (diff) | |
| download | rspamd-4b0b45c29baba61e43a546446be30a0ccdc1075f.tar.gz rspamd-4b0b45c29baba61e43a546446be30a0ccdc1075f.zip | |
Adopt spf module for new from/rcpt.
Diffstat (limited to 'src/libserver/protocol.c')
| -rw-r--r-- | src/libserver/protocol.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c index e7be5a1c3..38d6452cf 100644 --- a/src/libserver/protocol.c +++ b/src/libserver/protocol.c @@ -229,10 +229,10 @@ gboolean rspamd_protocol_handle_headers (struct rspamd_task *task, struct rspamd_http_message *msg) { - gchar *headern, *err, *tmp; + gchar *headern, *tmp; gboolean res = TRUE, validh; struct rspamd_http_header *h; - InternetAddressList *tmp; + InternetAddressList *tmp_addr; LL_FOREACH (msg->headers, h) { @@ -317,14 +317,14 @@ rspamd_protocol_handle_headers (struct rspamd_task *task, if (task->rcpt_envelope == NULL) { task->rcpt_envelope = internet_address_list_new (); } - tmp = internet_address_list_parse_string (h->value->str); - internet_address_list_append (task->rcpt_envelope, tmp); + tmp_addr = internet_address_list_parse_string (h->value->str); + internet_address_list_append (task->rcpt_envelope, tmp_addr); #ifdef GMIME24 - g_object_unref (tmp); + g_object_unref (tmp_addr); #else - internet_address_list_destroy (tmp); + internet_address_list_destroy (tmp_addr); #endif - debug_task ("read rcpt header, value: %s", tmp); + debug_task ("read rcpt header, value: %v", h->value); } else { msg_info ("wrong header: %s", headern); @@ -484,7 +484,7 @@ urls_protocol_cb (gpointer key, gpointer value, gpointer ud) msg_info ("<%s> URL: %s - %s: %s", cb->task->message_id, cb->task->user ? - cb->task->user : (cb->task->from ? cb->task->from : "unknown"), + cb->task->user : "unknown", rspamd_inet_address_to_string (&cb->task->from_addr), struri (url)); } |