From 791a2df656a1af81d3c016902ae4b4ceb1c732f0 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sat, 16 Jan 2010 12:37:30 +0100
Subject: s4 selftest: Fix and reenable WINBIND-STRUCT.NETBIOS_NAME test

---
 source4/selftest/knownfail             | 1 -
 source4/selftest/tests.sh              | 6 +++---
 source4/torture/winbind/struct_based.c | 9 +++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index df9eb7249b..a891f032df 100644
--- 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 0737b615a5..12e9b16f12 100755
--- 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 560fa4393d..872e17bb0d 100644
--- 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);
-- 
cgit