From 3854f0708e8c7a2e37310cd24d8acd52d87b9d6b Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 2 Jun 2010 15:35:33 +0200
Subject: s3-selftest: Fix blackbox smbclient s3 tests during make selftest.

Guenther
---
 selftest/selftest.pl      | 4 +++-
 selftest/target/Samba3.pm | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'selftest')

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index aa3d79c5d7..6ec429b6ce 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -787,6 +787,7 @@ my @exported_envvars = (
 
 	# user stuff
 	"USERNAME",
+	"USERID",
 	"PASSWORD",
 	"DC_USERNAME",
 	"DC_PASSWORD",
@@ -794,7 +795,8 @@ my @exported_envvars = (
 	# misc stuff
 	"KRB5_CONFIG",
 	"WINBINDD_SOCKET_DIR",
-	"WINBINDD_PRIV_PIPE_DIR"
+	"WINBINDD_PRIV_PIPE_DIR",
+	"LOCAL_PATH"
 );
 
 $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { 
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index de87311ad2..02dbbe0dc1 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -677,6 +677,7 @@ $unix_name-group:x:$unix_gids[0]:
 	$ret{CONFIGURATION} ="-s $conffile";
 	$ret{SERVER} = $server;
 	$ret{USERNAME} = $unix_name;
+	$ret{USERID} = $unix_uid;
 	$ret{DOMAIN} = $domain;
 	$ret{NETBIOSNAME} = $server;
 	$ret{PASSWORD} = $password;
@@ -687,6 +688,7 @@ $unix_name-group:x:$unix_gids[0]:
 	$ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
 	$ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
 	$ret{NSS_WRAPPER_WINBIND_SO_PATH} = $ENV{NSS_WRAPPER_WINBIND_SO_PATH};
+	$ret{LOCAL_PATH} = "$shrdir";
 
 	return \%ret;
 }
-- 
cgit