From 40dbe572e5884d123377608f83dbe4bc3054565e Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Sun, 15 Jul 2007 07:51:31 +0000 Subject: r23876: Prepare to run nsstest from make test, just not add it to tests_all.sh yet. (This used to be commit f45ae8a878c3d34ea2e4e1c7770e57cd96fa845b) --- source4/nsswitch/wb_common.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'source4/nsswitch/wb_common.c') diff --git a/source4/nsswitch/wb_common.c b/source4/nsswitch/wb_common.c index b368483141..7c17c32937 100644 --- a/source4/nsswitch/wb_common.c +++ b/source4/nsswitch/wb_common.c @@ -295,6 +295,7 @@ int winbind_open_pipe_sock(void) static pid_t our_pid; struct winbindd_request request; struct winbindd_response response; + const char *winbindd_socket_dir_env; ZERO_STRUCT(request); ZERO_STRUCT(response); @@ -307,7 +308,21 @@ int winbind_open_pipe_sock(void) return winbindd_fd; } - if ((winbindd_fd = winbind_named_pipe_sock(WINBINDD_SOCKET_DIR)) == -1) { +#ifdef DEVELOPER + winbindd_socket_dir_env = getenv(WINBINDD_SOCKET_DIR_ENV); + + if (!winbindd_socket_dir_env) + { + winbindd_socket_dir_env = WINBINDD_SOCKET_DIR; + } +#else + winbindd_socket_dir_env = WINBINDD_SOCKET_DIR; +#endif + + winbindd_fd = winbind_named_pipe_sock(winbindd_socket_dir_env); + + if (winbindd_fd == -1) + { return -1; } -- cgit