diff options
| -rw-r--r-- | nsswitch/wb_common.c | 12 | ||||
| -rw-r--r-- | source3/torture/wbc_async.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c index c1350aafd80..291e9c7824b 100644 --- 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 71e4de7c88e..8af95951eec 100644 --- 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; } |