summaryrefslogtreecommitdiff
path: root/source4/torture/winbind
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-15 22:08:49 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-15 22:08:49 +0200
commit038987543043346cdcd8a4b8fe2970cd1350a7a7 (patch)
tree63df88d6cc354bd766a4b9b3f36d3e43bf67872b /source4/torture/winbind
parentf01c377bc039b776ded213f455cdb79d682ae7b2 (diff)
parentb708a3d1e7f8d98bc6cedad8d405b1434d32a22e (diff)
downloadsamba-038987543043346cdcd8a4b8fe2970cd1350a7a7.tar.gz
samba-038987543043346cdcd8a4b8fe2970cd1350a7a7.tar.bz2
samba-038987543043346cdcd8a4b8fe2970cd1350a7a7.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
(This used to be commit 70ebb22c3df178a26c26c0a25c5722ff9ccdb0b4)
Diffstat (limited to 'source4/torture/winbind')
-rw-r--r--source4/torture/winbind/config.mk6
-rw-r--r--source4/torture/winbind/struct_based.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/torture/winbind/config.mk b/source4/torture/winbind/config.mk
index b64b0647fc..155766a677 100644
--- a/source4/torture/winbind/config.mk
+++ b/source4/torture/winbind/config.mk
@@ -6,10 +6,10 @@ SUBSYSTEM = torture
INIT_FUNCTION = torture_winbind_init
PRIVATE_PROTO_HEADER = \
proto.h
-OBJ_FILES = \
- winbind.o \
- struct_based.o
PRIVATE_DEPENDENCIES = \
LIBWINBIND-CLIENT
# End SUBSYSTEM TORTURE_WINBIND
#################################
+
+TORTURE_WINBIND_OBJ_FILES = $(addprefix torture/winbind/, winbind.o struct_based.o)
+
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
index 0fe2148b75..51ac0e622a 100644
--- 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");