From: Günther Deschner <gd@samba.org>
Date: Tue, 23 Jun 2009 22:24:03 +0000 (+0200)
Subject: s4-smbtorture: correctly test comment behaviour in RPC-SAMR-USERS against s3.
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=772d5dea303813514d53a42ac4114da8a9cb1c5a

s4-smbtorture: correctly test comment behaviour in RPC-SAMR-USERS against s3.

Guenther
---

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index be2bfefab1f0..11f7b3eb0bd0 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);