r23876: Prepare to run nsstest from make test, just not add it to tests_all.sh yet.

diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index b36848314140bf571d2cfd0fc48dcd4011ea566d..7c17c32937975ff37326f15db7d28e66fd09205e 100644 (file)
--- a/source/nsswitch/wb_common.c
+++ b/source/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;
        }
 

diff --git a/source/nsswitch/winbindd_nss.h b/source/nsswitch/winbindd_nss.h
index ae8a6846a3e9669fda2a0d14b71cd75ecaf86cc0..68aa41f45e73ccb91781958decd03a0c89f0f295 100644 (file)
--- a/source/nsswitch/winbindd_nss.h
+++ b/source/nsswitch/winbindd_nss.h
@@ -40,6 +40,10 @@
 #define WINBINDD_DOMAIN_ENV  "WINBINDD_DOMAIN" /* Environment variables */
 #define WINBINDD_DONT_ENV    "_NO_WINBINDD"
 
+#ifdef DEVELOPER
+#define WINBINDD_SOCKET_DIR_ENV "WINBINDD_SOCKET_DIR"
+#endif
+
 /* Update this when you change the interface.  */
 
 #define WINBIND_INTERFACE_VERSION 18

diff --git a/source/selftest/test_nss.sh b/source/selftest/test_nss.sh
new file mode 100755 (executable)
index 0000000..f493cbe
--- /dev/null
+++ b/source/selftest/test_nss.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+if [ ! -f bin/nsstest ]; then
+       exit 0
+fi
+
+plantest "NSS-TEST using winbind" member $VALGRIND bin/nsstest bin/shared/libnss_winbind.so
+