From: Tokunori Ikegami Date: Thu, 15 Jun 2023 15:16:50 +0000 (+0900) Subject: util: Use HAVE_NETDB instead of HAVE_LIBNSS X-Git-Tag: v1.5~15 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4c62b274f6b595875d7ae7f0dc3c800fb2711c20;p=users%2Fsagi%2Flibnvme.git util: Use HAVE_NETDB instead of HAVE_LIBNSS Signed-off-by: Tokunori Ikegami --- diff --git a/meson.build b/meson.build index cf6e4f4b..7cb1049f 100644 --- a/meson.build +++ b/meson.build @@ -216,7 +216,7 @@ conf.set10( ) conf.set( - 'HAVE_LIBNSS', + 'HAVE_NETDB', cc.links( '''#include #include @@ -226,7 +226,7 @@ conf.set( return getaddrinfo(argv[1], argv[2], &hints, &result); } ''', - name: 'libnss', + name: 'netdb', ), description: 'Is network address and service translation available' ) diff --git a/src/nvme/util.c b/src/nvme/util.c index 8592685b..853bbbe3 100644 --- a/src/nvme/util.c +++ b/src/nvme/util.c @@ -579,7 +579,7 @@ const char *nvme_errno_to_string(int status) return s; } -#ifdef HAVE_LIBNSS +#ifdef HAVE_NETDB char *hostname2traddr(struct nvme_root *r, const char *traddr) { struct addrinfo *host_info, hints = {.ai_family = AF_UNSPEC}; @@ -623,9 +623,7 @@ free_addrinfo: freeaddrinfo(host_info); return ret_traddr; } - -#else /* !HAVE_LIBNSS */ - +#else /* HAVE_NETDB */ char *hostname2traddr(struct nvme_root *r, const char *traddr) { nvme_msg(NULL, LOG_ERR, "No support for hostname IP address resolution; " \ @@ -634,7 +632,7 @@ char *hostname2traddr(struct nvme_root *r, const char *traddr) errno = -ENOTSUP; return NULL; } -#endif /* HAVE_LIBNSS */ +#endif /* HAVE_NETDB */ char *startswith(const char *s, const char *prefix) {