diff options
| author | Günther Deschner <gd@samba.org> | 2009-05-08 22:20:38 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-05-26 09:39:04 +0200 |
| commit | e7f97c4590ffb6eb2b48e644e5e102450c324f68 (patch) | |
| tree | 9ec94cbc37c1c35b865ae0160b0e86b3ccc9896d /source4 | |
| parent | 7874e1d8e210fcc140a6ac5acbd8d3047696779c (diff) | |
| download | samba-e7f97c4590ffb6eb2b48e644e5e102450c324f68.tar.gz | |
s4-smbtorture: skip unsupported ACB bits for Samba3 in RPC-SAMR-USER.
Guenther
(cherry picked from commit 4f3bfb6261dfb9836404399db57373ef91a411bf)
(cherry picked from commit 85ee8f36029deba69959aeacd68b55e676348d5f)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/samr.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index bf10da3bb35..dec8984ca85 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -189,9 +189,12 @@ static bool test_SetUserInfo(struct dcerpc_pipe *p, struct torture_context *tctx const char *test_account_name; uint32_t user_extra_flags = 0; - if (base_acct_flags == ACB_NORMAL) { - /* When created, accounts are expired by default */ - user_extra_flags = ACB_PW_EXPIRED; + + if (!torture_setting_bool(tctx, "samba3", false)) { + if (base_acct_flags == ACB_NORMAL) { + /* When created, accounts are expired by default */ + user_extra_flags = ACB_PW_EXPIRED; + } } s.in.user_handle = handle; @@ -501,6 +504,9 @@ static bool test_SetUserInfo(struct dcerpc_pipe *p, struct torture_context *tctx (base_acct_flags | ACB_DISABLED | user_extra_flags), 0); #endif + + /* Samba3 cannot store these atm */ + if (!torture_setting_bool(tctx, "samba3", false)) { /* The 'store plaintext' flag does stick */ TEST_USERINFO_INT_EXP(16, acct_flags, 21, acct_flags, (base_acct_flags | ACB_DISABLED | ACB_ENC_TXT_PWD_ALLOWED), @@ -521,7 +527,7 @@ static bool test_SetUserInfo(struct dcerpc_pipe *p, struct torture_context *tctx (base_acct_flags | ACB_DISABLED | ACB_NO_AUTH_DATA_REQD), (base_acct_flags | ACB_DISABLED | ACB_NO_AUTH_DATA_REQD | user_extra_flags), 0); - + } TEST_USERINFO_INT_EXP(21, acct_flags, 21, acct_flags, (base_acct_flags | ACB_DISABLED), (base_acct_flags | ACB_DISABLED | user_extra_flags), |