diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-09-11 11:49:24 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-09-11 11:49:24 +1000 |
| commit | 0cbfc686c4d8b8362de5980aecec3151b71838cc (patch) | |
| tree | 08c67356a466d4cc9c4af7a6463cc00b10a4a0f0 /source4/selftest | |
| parent | 238679edfa8aabff0e5b25922aee712673be2542 (diff) | |
| download | samba-0cbfc686c4d8b8362de5980aecec3151b71838cc.tar.gz samba-0cbfc686c4d8b8362de5980aecec3151b71838cc.tar.bz2 samba-0cbfc686c4d8b8362de5980aecec3151b71838cc.zip | |
Fix failures in the winbind struct-based test.
Don't try to pass the 'privileged' socket directory around for expected value testing - it is just too hard...
A better test (once we unify the winbind protocol with Samba3) would
be a operation to see if you are on the priv pipe, and that will give
acutal end-to-end testing.
Andrew Bartlett
(This used to be commit 2d4103518ab8a7286e65347b8b9b0ccb660e69f6)
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 1 | ||||
| -rw-r--r-- | source4/selftest/target/Samba4.pm | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 82c57de29a..6f6ffbba60 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -308,7 +308,6 @@ done WB_OPTS="--option=\"torture:strict mode=no\"" WB_OPTS="${WB_OPTS} --option=\"torture:timelimit=1\"" WB_OPTS="${WB_OPTS} --option=\"torture:winbindd separator=/\"" -WB_OPTS="${WB_OPTS} --option=\"torture:winbindd private pipe dir=\$WINBINDD_PRIV_PIPE_DIR\"" WB_OPTS="${WB_OPTS} --option=\"torture:winbindd netbios name=\$SERVER\"" WB_OPTS="${WB_OPTS} --option=\"torture:winbindd netbios domain=\$DOMAIN\"" diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm index 896b013105..8835f69c6c 100644 --- a/source4/selftest/target/Samba4.pm +++ b/source4/selftest/target/Samba4.pm @@ -523,7 +523,6 @@ sub provision($$$$$$) my $winbindd_socket_dir = "$prefix_abs/winbindd_socket"; my $winbindd_privileged_socket_dir = "$prefix_abs/winbindd_privileged_socket"; my $ntp_signd_socket_dir = "$prefix_abs/ntp_signd_socket"; - my $winbindd_priv_pipe_dir = "$privatedir/smbd.tmp/winbind_pipe"; my $nsswrap_passwd = "$etcdir/passwd"; my $nsswrap_group = "$etcdir/group"; @@ -739,7 +738,6 @@ nogroup:x:65534:nobody PASSWORD => $password, LDAPDIR => $ldapdir, WINBINDD_SOCKET_DIR => $winbindd_socket_dir, - WINBINDD_PRIV_PIPE_DIR => $winbindd_priv_pipe_dir, NCALRPCDIR => $ncalrpcdir, LOCKDIR => $lockdir, CONFIGURATION => $configuration, |