Fix some of the winbind tests.

Some of the test expectations were incorrect.

Andrew Bartlett
(This used to be commit bc0e94360edb99e967dac01a3ecff42de0c1c222)

diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index ed5e46cf031a319df140d4041efe33acce5fc544..3a3e1f91b175d754bff7fa3f7caf3c513c1e7984 100755 (executable)
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -302,7 +302,7 @@ done
 
 WB_OPTS="--option=\"torture:strict mode=yes\""
 WB_OPTS="${WB_OPTS} --option=\"torture:timelimit=1\""
-WB_OPTS="${WB_OPTS} --option=\"torture:winbindd separator=\\\\\""
+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 552f6535af2288d720cc9d1866ee32587f54af2e..069aff73cfb013f00b743cf7167a3ec967449015 100644 (file)
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -521,7 +521,7 @@ sub provision($$$$$$)
        my $ncalrpcdir = "$prefix_abs/ncalrpc";
        my $lockdir = "$prefix_abs/lockdir";
        my $winbindd_socket_dir = "$prefix_abs/winbind_socket";
-       my $winbindd_priv_pipe_dir = "$piddir/smbd.tmp/winbind_pipe";
+       my $winbindd_priv_pipe_dir = "$privatedir/smbd.tmp/winbind_pipe";
        my $nsswrap_passwd = "$etcdir/passwd";
        my $nsswrap_group = "$etcdir/group";
 

diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 0fe2148b75116999118676f2aa29fb29d0c02156..51ac0e622a12465a8ea9d2202c5faaed69d0ea43 100644 (file)
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -181,7 +181,8 @@ static bool torture_winbind_struct_netbios_name(struct torture_context *torture)
        expected = torture_setting_string(torture,
                                          "winbindd netbios name",
                                          lp_netbios_name(torture->lp_ctx));
-
+       expected = strupper_talloc(torture, expected);
+       
        torture_assert_str_equal(torture,
                                 rep.data.netbios_name, expected,
                                 "winbindd's netbios name doesn't match");