svn commit: samba r23876 - in branches/SAMBA_4_0/source: nsswitch selftest

[kai at samba.org]

Author: kai
Date: 2007-07-15 07:51:31 +0000 (Sun, 15 Jul 2007)
New Revision: 23876

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23876

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

Added:
   branches/SAMBA_4_0/source/selftest/test_nss.sh
Modified:
   branches/SAMBA_4_0/source/nsswitch/wb_common.c
   branches/SAMBA_4_0/source/nsswitch/winbindd_nss.h


Changeset:
Modified: branches/SAMBA_4_0/source/nsswitch/wb_common.c
===================================================================
--- branches/SAMBA_4_0/source/nsswitch/wb_common.c	2007-07-14 00:12:25 UTC (rev 23875)
+++ branches/SAMBA_4_0/source/nsswitch/wb_common.c	2007-07-15 07:51:31 UTC (rev 23876)
@@ -295,6 +295,7 @@
 	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 @@
 		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;
 	}
 

Modified: branches/SAMBA_4_0/source/nsswitch/winbindd_nss.h
===================================================================
--- branches/SAMBA_4_0/source/nsswitch/winbindd_nss.h	2007-07-14 00:12:25 UTC (rev 23875)
+++ branches/SAMBA_4_0/source/nsswitch/winbindd_nss.h	2007-07-15 07:51:31 UTC (rev 23876)
@@ -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

Added: branches/SAMBA_4_0/source/selftest/test_nss.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/test_nss.sh	2007-07-14 00:12:25 UTC (rev 23875)
+++ branches/SAMBA_4_0/source/selftest/test_nss.sh	2007-07-15 07:51:31 UTC (rev 23876)
@@ -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
+


Property changes on: branches/SAMBA_4_0/source/selftest/test_nss.sh
___________________________________________________________________
Name: svn:executable
   + *