diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 15:35:33 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-02 15:37:50 +0200 |
| commit | 3854f0708e8c7a2e37310cd24d8acd52d87b9d6b (patch) | |
| tree | b520ee6fdff46953ecdfe1a7892154551889711c /selftest | |
| parent | 57ab910b6f3a24bf188415baf58de610203594b1 (diff) | |
| download | samba-3854f0708e8c7a2e37310cd24d8acd52d87b9d6b.tar.gz | |
s3-selftest: Fix blackbox smbclient s3 tests during make selftest.
Guenther
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/selftest.pl | 4 | ||||
| -rw-r--r-- | selftest/target/Samba3.pm | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index aa3d79c5d78..6ec429b6ce4 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 de87311ad29..02dbbe0dc10 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; } |