From a2a3eb1393b5c37881a355d1e714bdc9c87fe7cf Mon Sep 17 00:00:00 2001 From: Domen Puncer Date: Tue, 10 Jun 2014 14:29:49 +0100 Subject: libxtables: fix getaddrinfo return value usage getaddrinfo return value on error can also be positive. On Android they're positive, e.g.: android-ndk-r9d/platforms/android-19/arch-arm/usr/include/netdb.h 147 #define EAI_NONAME 8 /* hostname nor servname provided, or not known */ And as a plus, it's not bad to conform to specs. Signed-off-by: Domen Puncer Kugler Signed-off-by: Pablo Neira Ayuso --- libxtables/xtoptions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libxtables/xtoptions.c b/libxtables/xtoptions.c index 9b4c5aa5..d26d2f8b 100644 --- a/libxtables/xtoptions.c +++ b/libxtables/xtoptions.c @@ -519,7 +519,7 @@ static void xtopt_parse_host(struct xt_option_call *cb) int ret; ret = getaddrinfo(cb->arg, NULL, &hints, &res); - if (ret < 0) + if (ret != 0) xt_params->exit_err(PARAMETER_PROBLEM, "getaddrinfo: %s\n", gai_strerror(ret)); @@ -562,7 +562,7 @@ static int xtables_getportbyname(const char *name) int ret; ret = getaddrinfo(NULL, name, NULL, &res); - if (ret < 0) + if (ret != 0) return -1; ret = -1; for (p = res; p != NULL; p = p->ai_next) { @@ -675,7 +675,7 @@ static int xtopt_parse_mask(struct xt_option_call *cb) int ret; ret = getaddrinfo(cb->arg, NULL, &hints, &res); - if (ret < 0) + if (ret != 0) return 0; memcpy(&cb->val.hmask, xtables_sa_host(res->ai_addr, res->ai_family), -- cgit v1.2.3