nwrap: Fix library variables for Solaris.

diff --git a/config.h.cmake b/config.h.cmake
index a4bb31b5334559544486c291f31a3092d946209c..c1523aed20904ba68c8db375a31520d98ae9a3db 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -57,8 +57,8 @@
 
 /*************************** LIBRARIES ***************************/
 
-#cmakedefine HAVE_NSL 1
-#cmakedefine HAVE_SOCKET 1
+#cmakedefine HAVE_LIBNSL 1
+#cmakedefine HAVE_LIBSOCKET 1
 
 /**************************** OPTIONS ****************************/
 

diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index ab63a33d13c298ead442b8d88ceb0871282e0186..a4d37bbb6074a496cf3495a5cdc07624a73f5bf0 100644 (file)
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -623,7 +623,7 @@ static void nwrap_libc_init(struct nwrap_main *r)
                exit(-1);
        }
 
-#ifdef HAVE_NSL
+#ifdef HAVE_LIBNSL
        for (r->libc->nsl_handle = NULL, i = 10; r->libc->nsl_handle == NULL; i--) {
                char soname[256] = {0};
 
@@ -636,7 +636,7 @@ static void nwrap_libc_init(struct nwrap_main *r)
                exit(-1);
        }
 #endif
-#ifdef HAVE_SOCKET
+#ifdef HAVE_LIBSOCKET
        for (r->libc->sock_handle = NULL, i = 10; r->libc->sock_handle == NULL; i--) {
                char soname[256] = {0};
 
@@ -726,7 +726,7 @@ static void nwrap_libc_init(struct nwrap_main *r)
                nwrap_libc_fn(handle, "getgrouplist");
 #endif
 
-#ifdef HAVE_NSL
+#ifdef HAVE_LIBNSL
        /* Load symbols of libnsl */
        handle = r->libc->nsl_handle;
 #endif
@@ -751,7 +751,7 @@ static void nwrap_libc_init(struct nwrap_main *r)
                nwrap_libc_fn(handle, "gethostbyaddr_r");
 #endif
 
-#ifdef HAVE_SOCKET
+#ifdef HAVE_LIBSOCKET
        /* Load symbols of libsocket */
        handle = r->libc->sock_handle;
 #endif