s4 selftest: Fix and reenable WINBIND-STRUCT.NETBIOS_NAME test

diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index df9eb7249b366581ed1bc537b41f98028aca7fdd..a891f032dfebd882546e3991ca35042ae8c2d472 100644 (file)
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -51,7 +51,6 @@ samba4.winbind.struct.*.SHOW_SEQUENCE     # Not yet working in winbind
 samba4.winbind.struct.*.GETPWENT          # Not yet working in winbind
 samba4.winbind.struct.*.SETPWENT          # Not yet working in winbind
 samba4.winbind.struct.*.LOOKUP_NAME_SID   # Not yet working in winbind
-samba4.winbind.struct.*.NETBIOS_NAME
 samba4.winbind.struct.*.LIST_GROUPS
 ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate$
 ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand$

diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 0737b615a58cca8c4b80c7e98bf0de43880d80a7..12e9b16f12ed5ba70a0ace12803828cb8b4e0074 100755 (executable)
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -413,9 +413,9 @@ 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 netbios name=\$SERVER\""
-WB_OPTS="${WB_OPTS} --option=\"torture:winbindd netbios domain=\$DOMAIN\""
+WB_OPTS="${WB_OPTS} --option=\"torture:winbindd_separator=/\""
+WB_OPTS="${WB_OPTS} --option=\"torture:winbindd_netbios_name=\$SERVER\""
+WB_OPTS="${WB_OPTS} --option=\"torture:winbindd_netbios_domain=\$DOMAIN\""
 
 WINBIND_STRUCT_TESTS=`$smb4torture --list | grep "^WINBIND-STRUCT" | xargs`
 WINBIND_NDR_TESTS=`$smb4torture --list | grep "^WINBIND-NDR" | xargs`

diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 560fa4393d171440ef331d5dbeaa525795272c8b..872e17bb0d16569f915db52c799dd82d118e0efc 100644 (file)
--- a/source4/torture/winbind/struct_based.c
+++ b/source4/torture/winbind/struct_based.c
@@ -122,8 +122,9 @@ static bool torture_winbind_struct_info(struct torture_context *torture)
        DO_STRUCT_REQ_REP(WINBINDD_INFO, NULL, &rep);
 
        separator = torture_setting_string(torture,
-                                          "winbindd separator",
+                                          "winbindd_separator",
                                           lp_winbind_separator(torture->lp_ctx));
+
        torture_assert_int_equal(torture,
                                 rep.data.info.winbind_separator,
                                 *separator,
@@ -199,7 +200,7 @@ static bool torture_winbind_struct_domain_name(struct torture_context *torture)
        torture_comment(torture, "Running WINBINDD_DOMAIN_NAME (struct based)\n");
 
        expected = torture_setting_string(torture,
-                                         "winbindd netbios domain",
+                                         "winbindd_netbios_domain",
                                          lp_workgroup(torture->lp_ctx));
 
        get_winbind_domain(torture, &domain);
@@ -474,7 +475,7 @@ static bool torture_winbind_struct_getdcname(struct torture_context *torture)
        bool ok;
        bool strict = torture_setting_bool(torture, "strict mode", false);
        const char *domain_name = torture_setting_string(torture,
-                                       "winbindd netbios domain",
+                                       "winbindd_netbios_domain",
                                        lp_workgroup(torture->lp_ctx));
        struct torture_trust_domain *listd = NULL;
        uint32_t i, count = 0;
@@ -915,7 +916,7 @@ static bool lookup_name_sid_list(struct torture_context *torture, char **list)
                char *sid;
                char *name;
                const char *domain_name = torture_setting_string(torture,
-                                               "winbindd netbios domain",
+                                               "winbindd_netbios_domain",
                                                lp_workgroup(torture->lp_ctx));
 
                ZERO_STRUCT(req);