diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-01-05 15:24:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:19 -0500 |
| commit | a4fc93023506bcc41f869e75d895c5273a2a5cf4 (patch) | |
| tree | e7c0f845fa8bca4899e077b630b2e0d4759db516 /source4/torture | |
| parent | e1944a3d6d2d4e8772c17891486bbcb992c7096a (diff) | |
| download | samba-a4fc93023506bcc41f869e75d895c5273a2a5cf4.tar.gz samba-a4fc93023506bcc41f869e75d895c5273a2a5cf4.tar.bz2 samba-a4fc93023506bcc41f869e75d895c5273a2a5cf4.zip | |
r4532: - rename bitmap -> bits
the next commit is support for typedef bitmap {...}; in pidl
metze
(This used to be commit bd06a85cb747aea29a400050cb9d25a3240ef1cc)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/rpc/samr.c | 12 | ||||
| -rw-r--r-- | source4/torture/rpc/samsync.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index ea645d72d4..5d20587d26 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -245,11 +245,11 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, s2.in.level = lvl1; \ u = *q.out.info; \ if (lvl1 == 21) { \ - uint8_t *bitmap = u.info21.logon_hours.bitmap; \ + uint8_t *bits = u.info21.logon_hours.bits; \ ZERO_STRUCT(u.info21); \ if (fpval == SAMR_FIELD_LOGON_HOURS) { \ u.info21.logon_hours.units_per_week = 168; \ - u.info21.logon_hours.bitmap = bitmap; \ + u.info21.logon_hours.bits = bits; \ } \ u.info21.fields_present = fpval; \ } \ @@ -324,10 +324,10 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, TEST_USERINFO_INT(21, code_page, 21, code_page, __LINE__, SAMR_FIELD_CODE_PAGE); - TEST_USERINFO_INT(4, logon_hours.bitmap[3], 3, logon_hours.bitmap[3], 1, 0); - TEST_USERINFO_INT(4, logon_hours.bitmap[3], 5, logon_hours.bitmap[3], 2, 0); - TEST_USERINFO_INT(4, logon_hours.bitmap[3], 21, logon_hours.bitmap[3], 3, 0); - TEST_USERINFO_INT(21, logon_hours.bitmap[3], 21, logon_hours.bitmap[3], 4, + TEST_USERINFO_INT(4, logon_hours.bits[3], 3, logon_hours.bits[3], 1, 0); + TEST_USERINFO_INT(4, logon_hours.bits[3], 5, logon_hours.bits[3], 2, 0); + TEST_USERINFO_INT(4, logon_hours.bits[3], 21, logon_hours.bits[3], 3, 0); + TEST_USERINFO_INT(21, logon_hours.bits[3], 21, logon_hours.bits[3], 4, SAMR_FIELD_LOGON_HOURS); TEST_USERINFO_INT_EXP(16, acct_flags, 5, acct_flags, diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index e85fa8db4f..171e615196 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -453,7 +453,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy TEST_INT_EQUAL(q.out.info->info21.logon_hours.units_per_week, user->logon_hours.units_per_week); if (ret) { - if (memcmp(q.out.info->info21.logon_hours.bitmap, user->logon_hours.bitmap, + if (memcmp(q.out.info->info21.logon_hours.bits, user->logon_hours.bits, q.out.info->info21.logon_hours.units_per_week/8) != 0) { printf("Logon hours mismatch\n"); ret = False; |