wbclient: Check with nss_wrapper_enabled().

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c
index c1350aafd805171afc6dd8dde472ccf52e2cd345..291e9c7824bd33f62874c0855e470b33cee835b5 100644 (file)
--- a/nsswitch/wb_common.c
+++ b/nsswitch/wb_common.c
@@ -317,14 +317,14 @@ static int winbind_named_pipe_sock(const char *dir)
 
 static const char *winbindd_socket_dir(void)
 {
-#ifdef SOCKET_WRAPPER
-       const char *env_dir;
+       if (nss_wrapper_enabled()) {
+               const char *env_dir;
 
-       env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR);
-       if (env_dir) {
-               return env_dir;
+               env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR);
+               if (env_dir != NULL) {
+                       return env_dir;
+               }
        }
-#endif
 
        return WINBINDD_SOCKET_DIR;
 }

diff --git a/source3/torture/wbc_async.c b/source3/torture/wbc_async.c
index 71e4de7c88e56cc898c01a804d4990fa3402ff53..8af95951eec370e7599ba49386c539a9c6a4030d 100644 (file)
--- a/source3/torture/wbc_async.c
+++ b/source3/torture/wbc_async.c
@@ -325,14 +325,14 @@ static wbcErr wb_connect_recv(struct tevent_req *req)
 
 static const char *winbindd_socket_dir(void)
 {
-#ifdef SOCKET_WRAPPER
-       const char *env_dir;
+       if (nss_wrapper_enabled()) {
+               const char *env_dir;
 
-       env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR);
-       if (env_dir) {
-               return env_dir;
+               env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR);
+               if (env_dir != NULL) {
+                       return env_dir;
+               }
        }
-#endif
 
        return WINBINDD_SOCKET_DIR;
 }