Commit b5e33ae5 authored by Simon Kelley's avatar Simon Kelley

Log ipset errors.

parent 3c0c1111
...@@ -211,7 +211,7 @@ static int old_add_to_ipset(const char *setname, const struct all_addr *ipaddr, ...@@ -211,7 +211,7 @@ static int old_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
int add_to_ipset(const char *setname, const struct all_addr *ipaddr, int flags, int remove) int add_to_ipset(const char *setname, const struct all_addr *ipaddr, int flags, int remove)
{ {
int af = AF_INET; int ret = 0, af = AF_INET;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (flags & F_IPV6) if (flags & F_IPV6)
...@@ -219,11 +219,20 @@ int add_to_ipset(const char *setname, const struct all_addr *ipaddr, int flags, ...@@ -219,11 +219,20 @@ int add_to_ipset(const char *setname, const struct all_addr *ipaddr, int flags,
af = AF_INET6; af = AF_INET6;
/* old method only supports IPv4 */ /* old method only supports IPv4 */
if (old_kernel) if (old_kernel)
return -1; {
errno = EAFNOSUPPORT ;
ret = -1;
}
} }
#endif #endif
return old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove); if (ret != -1)
ret = old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove);
if (ret == -1)
my_syslog(LOG_ERR, _("failed to update ipset %s: %s"), setname, strerror(errno));
return ret;
} }
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment