diff options
| author | Andreas Schneider <asn@samba.org> | 2014-02-13 15:53:29 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-17 14:56:06 +0200 |
| commit | c29fb2e6157c90e7f0c6b37e9923152d999e76dc (patch) | |
| tree | b47753cb55d9cad9a5942ba2f40c9b9e6f7e4c0f /nsswitch | |
| parent | 354744f6e8e03b3552d19d8223c821d37b25e7fa (diff) | |
| download | samba-c29fb2e6157c90e7f0c6b37e9923152d999e76dc.tar.gz samba-c29fb2e6157c90e7f0c6b37e9923152d999e76dc.tar.xz samba-c29fb2e6157c90e7f0c6b37e9923152d999e76dc.zip | |
wbclient: Check with nss_wrapper_enabled().
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/wb_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c index c1350aafd8..291e9c7824 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; } |