summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2008-12-09 23:32:04 +0100
committerGünther Deschner <gd@samba.org>2008-12-10 00:07:25 +0100
commit6e4cc12604f6bcf53961326d497f118dfe5da139 (patch)
tree22b416b0aa2edac5a48bf067c932eab05004d5f8
parent91bfd5f201f302156fac7f1bc7a685e6f3c22cf3 (diff)
downloadsamba-6e4cc12604f6bcf53961326d497f118dfe5da139.tar.gz
samba-6e4cc12604f6bcf53961326d497f118dfe5da139.tar.bz2
samba-6e4cc12604f6bcf53961326d497f118dfe5da139.zip
s4-samr: Fix Bug #5946. userparameters handling in torture test.
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source4/torture/rpc/samr.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index d29c864b92..2912628744 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -409,6 +409,12 @@ static bool test_SetUserInfo(struct dcerpc_pipe *p, struct torture_context *tctx
SAMR_FIELD_PARAMETERS);
TEST_USERINFO_BINARYSTRING(21, parameters, 20, parameters, "xx21-20 parameters",
SAMR_FIELD_PARAMETERS);
+ /* also empty user parameters are allowed */
+ TEST_USERINFO_BINARYSTRING(20, parameters, 21, parameters, "", 0);
+ TEST_USERINFO_BINARYSTRING(21, parameters, 21, parameters, "",
+ SAMR_FIELD_PARAMETERS);
+ TEST_USERINFO_BINARYSTRING(21, parameters, 20, parameters, "",
+ SAMR_FIELD_PARAMETERS);
TEST_USERINFO_INT(2, country_code, 2, country_code, __LINE__, 0);
TEST_USERINFO_INT(2, country_code, 21, country_code, __LINE__, 0);
@@ -2674,7 +2680,7 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
struct policy_handle *handle,
char **password)
{
- int i, s = 0, q = 0, f = 0, l = 0, z = 0;
+ int s = 0, q = 0, f = 0, l = 0, z = 0;
bool ret = true;
int delay = 500000;
bool set_levels[] = { false, true };