]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Parse IPv6 addresses even if IPv6 is disabled
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Sun, 25 Feb 2018 16:26:28 +0000 (16:26 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Sun, 25 Feb 2018 16:26:28 +0000 (16:26 +0000)
src/libutil/addr.c

index 7dfa01639efcf6c4db82f73a821250e8680cc364..9ea25c1ee7ec5b13b4e9990e60bb1656f4519ca0 100644 (file)
@@ -716,8 +716,7 @@ rspamd_parse_inet_address (rspamd_inet_addr_t **target,
 
                rspamd_strlcpy (ipbuf, src + 1, iplen + 1);
 
-               if (ipv6_status == RSPAMD_IPV6_SUPPORTED &&
-                               rspamd_parse_inet_address_ip6 (ipbuf, iplen,
+               if (rspamd_parse_inet_address_ip6 (ipbuf, iplen,
                                                &su.s6.sin6_addr)) {
                        addr = rspamd_inet_address_v6_maybe_map (&su.s6);
                        ret = TRUE;
@@ -735,7 +734,6 @@ rspamd_parse_inet_address (rspamd_inet_addr_t **target,
                        /* This is either port number and ipv4 addr or ipv6 addr */
                        /* Search for another semicolon */
                        if (memchr (end + 1, ':', srclen - (end - src + 1)) &&
-                                       ipv6_status == RSPAMD_IPV6_SUPPORTED &&
                                        rspamd_parse_inet_address_ip6 (src, srclen, &su.s6.sin6_addr)) {
                                addr = rspamd_inet_address_v6_maybe_map (&su.s6);
                                ret = TRUE;
@@ -769,8 +767,7 @@ rspamd_parse_inet_address (rspamd_inet_addr_t **target,
                                                sizeof (struct in_addr));
                                ret = TRUE;
                        }
-                       else if (ipv6_status == RSPAMD_IPV6_SUPPORTED &&
-                                       rspamd_parse_inet_address_ip6 (src, srclen, &su.s6.sin6_addr)) {
+                       else if (rspamd_parse_inet_address_ip6 (src, srclen, &su.s6.sin6_addr)) {
                                addr = rspamd_inet_address_v6_maybe_map (&su.s6);
                                ret = TRUE;
                        }