s3 test: Fix WINBINDD-STRUCT tests

The struct-based tests are working in make selftest, make them work in plain
"make test" as well.

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c952ef202944c6ea53dc2588f982209eb4240ef5..91052a706532c962c00b7aedbf3ecd988193b0d6 100755 (executable)
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -244,6 +244,8 @@ cat >$SERVERCONFFILE<<EOF
        winbindd:socket dir = $WINBINDD_SOCKET_DIR
        idmap uid = 100000-200000
        idmap gid = 100000-200000
+       winbind enum users = yes
+       winbind enum groups = yes
 
 #      min receivefile size = 4000
 
@@ -347,6 +349,7 @@ TORTURE4_OPTIONS="$SAMBA4CONFIGURATION"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --maximum-runtime=$TORTURE_MAXTIME"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --target=samba3"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:localdir=$SHRDIR"
+TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:winbindd_netbios_name=$SERVER"
 export TORTURE4_OPTIONS
 
 if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then

diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 2f8242883956c788be655f5d9c7d50d4b2f34278..560fa4393d171440ef331d5dbeaa525795272c8b 100644 (file)
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -166,10 +166,10 @@ static bool torture_winbind_struct_netbios_name(struct torture_context *torture)
        DO_STRUCT_REQ_REP(WINBINDD_NETBIOS_NAME, NULL, &rep);
 
        expected = torture_setting_string(torture,
-                                         "winbindd netbios name",
+                                         "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");