summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-12-05 15:47:48 +0100
committerGünther Deschner <gd@samba.org>2008-12-05 15:48:47 +0100
commit58102a366baa605cee013697d9e78b5fd8a39a9f (patch)
tree7d56e488a5cb88803f6ea9fd411e671d34bbb49a
parent420a9071e1227435aada2a52c83ee44fda7180ed (diff)
downloadsamba-58102a366baa605cee013697d9e78b5fd8a39a9f.tar.gz
samba-58102a366baa605cee013697d9e78b5fd8a39a9f.tar.bz2
samba-58102a366baa605cee013697d9e78b5fd8a39a9f.zip
s4-smbtorture: fix build of samr test (bad git merge).
Guenther
-rw-r--r--source4/torture/rpc/samr.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index cc3c4156ba..dc1be429d9 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2463,8 +2463,8 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
},{
.level = 21,
.password_expired_nonzero = 1,
- .fields_present = SAMR_FIELD_PASSWORD |
- SAMR_FIELD_PASSWORD2 |
+ .fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT |
+ SAMR_FIELD_LM_PASSWORD_PRESENT |
SAMR_FIELD_LAST_PWD_CHANGE,
.query_info2 = false,
.set_error = NT_STATUS_ACCESS_DENIED
@@ -2484,28 +2484,28 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
.level = 23,
.password_expired_nonzero = 1,
.fields_present = SAMR_FIELD_LAST_PWD_CHANGE |
- SAMR_FIELD_PASSWORD |
- SAMR_FIELD_PASSWORD2,
+ SAMR_FIELD_NT_PASSWORD_PRESENT |
+ SAMR_FIELD_LM_PASSWORD_PRESENT,
.set_error = NT_STATUS_ACCESS_DENIED
},{
.level = 23,
.password_expired_nonzero = 1,
.fields_present = SAMR_FIELD_LAST_PWD_CHANGE |
- SAMR_FIELD_PASSWORD |
- SAMR_FIELD_PASSWORD2 |
+ SAMR_FIELD_NT_PASSWORD_PRESENT |
+ SAMR_FIELD_LM_PASSWORD_PRESENT |
SAMR_FIELD_EXPIRED_FLAG,
.set_error = NT_STATUS_ACCESS_DENIED
},{
.level = 23,
.password_expired_nonzero = 1,
- .fields_present = SAMR_FIELD_PASSWORD |
- SAMR_FIELD_PASSWORD2 |
+ .fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT |
+ SAMR_FIELD_LM_PASSWORD_PRESENT |
SAMR_FIELD_EXPIRED_FLAG
},{
.level = 23,
.password_expired_nonzero = 1,
- .fields_present = SAMR_FIELD_PASSWORD |
- SAMR_FIELD_PASSWORD2,
+ .fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT |
+ SAMR_FIELD_LM_PASSWORD_PRESENT,
},{
.level = 23,
.password_expired_nonzero = 1,
@@ -2539,14 +2539,14 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
},{
.level = 25,
.password_expired_nonzero = 1,
- .fields_present = SAMR_FIELD_PASSWORD |
- SAMR_FIELD_PASSWORD2 |
+ .fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT |
+ SAMR_FIELD_LM_PASSWORD_PRESENT |
SAMR_FIELD_EXPIRED_FLAG
},{
.level = 25,
.password_expired_nonzero = 1,
- .fields_present = SAMR_FIELD_PASSWORD |
- SAMR_FIELD_PASSWORD2,
+ .fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT |
+ SAMR_FIELD_LM_PASSWORD_PRESENT,
},{
.level = 25,
.password_expired_nonzero = 1,
@@ -2669,9 +2669,9 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
* password has been changed, old and new pwdlastset
* need to be the same value */
- if (!(fields_present[f] & SAMR_FIELD_EXPIRED_FLAG) &&
- !((fields_present[f] & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
- (fields_present[f] & SAMR_FIELD_LM_PASSWORD_PRESENT)))
+ if (!(pwd_tests[i].fields_present & SAMR_FIELD_EXPIRED_FLAG) &&
+ !((pwd_tests[i].fields_present & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
+ (pwd_tests[i].fields_present & SAMR_FIELD_LM_PASSWORD_PRESENT)))
{
torture_assert_int_equal(tctx, pwdlastset_old,
pwdlastset_new, "pwdlastset must be equal");
@@ -2732,9 +2732,9 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
* password has been changed, old and new pwdlastset
* need to be the same value */
- if (!(fields_present[f] & SAMR_FIELD_EXPIRED_FLAG) &&
- !((fields_present[f] & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
- (fields_present[f] & SAMR_FIELD_LM_PASSWORD_PRESENT)))
+ if (!(pwd_tests[i].fields_present & SAMR_FIELD_EXPIRED_FLAG) &&
+ !((pwd_tests[i].fields_present & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
+ (pwd_tests[i].fields_present & SAMR_FIELD_LM_PASSWORD_PRESENT)))
{
torture_assert_int_equal(tctx, pwdlastset_old,
pwdlastset_new, "pwdlastset must be equal");