Fixes for protocol and spf code.

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index ac6cd40774c4ea1286e018c5944b3416f983365c..3c6dd41a942df61b4e571d4a3ea6c0e3a5917d67 100644 (file)
--- 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 5868584a6b8f728df6e92ab2e02784d228196ee7..13eff0c2773ed6f44bfa3ff019de2e157ebc0190 100644 (file)
--- 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':