sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00
Code

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

Browse Source
This commit is contained in:
Kai Blin 2007-07-15 07:51:31 +00:00 committed by Gerald (Jerry) Carter
parent 923d67ea9d
commit f45ae8a878
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/nsswitch/wb_common.c
View File

@ -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;
}

4
source/nsswitch/winbindd_nss.h
View File

@ -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

11
source/selftest/test_nss.sh Executable file
View File

@ -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