From cf38a1f850dd3712e7cd71364cc86ecba7871d03 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Thu, 14 Jan 2010 13:21:44 +0100
Subject: [PATCH] s3 test: Fix WINBINDD-STRUCT tests

The struct-based tests are working in make selftest, make them work in plain
"make test" as well.
---
 source3/script/tests/selftest.sh       | 3 +++
 source4/torture/winbind/struct_based.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c952ef20294..91052a70653 100755
--- 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 2f824288395..560fa4393d1 100644
--- 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");
-- 
2.34.1