From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 12 Mar 2015 15:55:05 +0000 (+0000)
Subject: Fixes for protocol and spf code.
X-Git-Tag: 0.9.0~512^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74c2e7ef6dbd35e3a4d37effa95748a19dc8e960;p=rspamd.git

Fixes for protocol and spf code.
---

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index ac6cd4077..3c6dd41a9 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -514,7 +514,7 @@ urls_protocol_cb (gpointer key, gpointer value, gpointer ud)
 			cb->task->message_id,
 			cb->task->user ?
 			cb->task->user : "unknown",
-			rspamd_inet_address_to_string (&cb->task->from_addr),
+			rspamd_inet_address_to_string (cb->task->from_addr),
 			struri (url));
 	}
 
diff --git a/src/libserver/spf.c b/src/libserver/spf.c
index 5868584a6..13eff0c27 100644
--- a/src/libserver/spf.c
+++ b/src/libserver/spf.c
@@ -825,7 +825,7 @@ parse_spf_ptr (struct rspamd_task *task,
 	cb->ptr_host = host;
 	ptr =
 		rdns_generate_ptr_from_str (rspamd_inet_address_to_string (
-				&task->from_addr));
+				task->from_addr));
 	if (ptr == NULL) {
 		return FALSE;
 	}
@@ -1259,16 +1259,10 @@ expand_spf_macro (struct rspamd_task *task, struct spf_record *rec,
 			/* Read macro name */
 			switch (g_ascii_tolower (*p)) {
 			case 'i':
-#ifdef HAVE_INET_PTON
 				len = rspamd_strlcpy (ip_buf,
-						rspamd_inet_address_to_string (&task->from_addr),
+						rspamd_inet_address_to_string (task->from_addr),
 						sizeof (ip_buf));
 				memcpy (c, ip_buf, len);
-#else
-				tmp = inet_ntoa (task->from_addr);
-				len = strlen (tmp);
-				memcpy (c, tmp, len);
-#endif
 				c += len;
 				break;
 			case 's':