nwrap: simplify logic in nwrap_getaddrinfo, calling nwrap_files_getaddrinfo
authorMichael Adam <obnox@samba.org>
Fri, 6 Nov 2015 10:48:40 +0000 (11:48 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 11 Jan 2016 11:25:29 +0000 (12:25 +0100)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
lib/nss_wrapper/nss_wrapper.c

index 3dce079eca6761675bc2151785deaf1bfba0cb05..2f4388bb17fb32fc7a0eee8dbd456997f00daca4 100644 (file)
@@ -5047,7 +5047,6 @@ static int nwrap_getaddrinfo(const char *node,
        } addr = {
                .family = AF_UNSPEC,
        };
-       int eai = EAI_SYSTEM;
        int ret;
        int rc;
 
@@ -5128,13 +5127,8 @@ valid_port:
 #endif
        }
 
-       rc = -1;
        ai = nwrap_files_getaddrinfo(node, port, hints, &ai_tail);
-       if (ai != NULL) {
-               rc = 1;
-       }
-
-       if (rc < 0) {
+       if (ai == NULL) {
                if (ret == 0) {
                        /*
                         * nwrap_files_getaddrinfo failed, but libc was
@@ -5143,7 +5137,7 @@ valid_port:
                        return 0;
                }
 
-               return eai;
+               return EAI_SYSTEM;
        }
 
        if (ret == 0) {