summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-06-24 00:24:03 +0200
committerGünther Deschner <gd@samba.org>2009-06-29 22:36:12 +0200
commit772d5dea303813514d53a42ac4114da8a9cb1c5a (patch)
tree719bd3b78bf5ebb3ff5122a0e7e96f600b7493bd
parent28ef5c3ece00e9f314709e74f28dc2ebc3987015 (diff)
downloadsamba-772d5dea303813514d53a42ac4114da8a9cb1c5a.tar.gz
s4-smbtorture: correctly test comment behaviour in RPC-SAMR-USERS against s3.
Guenther
-rw-r--r--source4/torture/rpc/samr.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index be2bfefab1..11f7b3eb0b 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -339,13 +339,10 @@ static bool test_SetUserInfo(struct dcerpc_pipe *p, struct torture_context *tctx
q0.in.level = 12;
do { TESTCALL(QueryUserInfo, q0) } while (0);
- /* Samba 3 cannot store comment fields atm. - gd */
- if (!torture_setting_bool(tctx, "samba3", false)) {
- TEST_USERINFO_STRING(2, comment, 1, comment, "xx2-1 comment", 0);
- TEST_USERINFO_STRING(2, comment, 21, comment, "xx2-21 comment", 0);
- TEST_USERINFO_STRING(21, comment, 21, comment, "xx21-21 comment",
- SAMR_FIELD_COMMENT);
- }
+ TEST_USERINFO_STRING(2, comment, 1, comment, "xx2-1 comment", 0);
+ TEST_USERINFO_STRING(2, comment, 21, comment, "xx2-21 comment", 0);
+ TEST_USERINFO_STRING(21, comment, 21, comment, "xx21-21 comment",
+ SAMR_FIELD_COMMENT);
test_account_name = talloc_asprintf(tctx, "%sxx7-1", base_account_name);
TEST_USERINFO_STRING(7, account_name, 1, account_name, base_account_name, 0);