diff options
author | Jeremy Allison <jra@samba.org> | 1998-08-24 21:49:10 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 1998-08-24 21:49:10 +0000 |
commit | 8afc9c80ac11649f06e5517d819dbf201c941acb (patch) | |
tree | 99823c267e34902aae622643b2e2fb412d5f846c /source3/rpc_parse/parse_samr.c | |
parent | 0e877bd53bcffcaeab738610ca64c685c99f8263 (diff) | |
download | samba-8afc9c80ac11649f06e5517d819dbf201c941acb.tar.gz samba-8afc9c80ac11649f06e5517d819dbf201c941acb.tar.bz2 samba-8afc9c80ac11649f06e5517d819dbf201c941acb.zip |
Changed ASSERT macros to SMB_ASSERT macros as some systems already
have an ASSERT macro defined.
Jeremy.
(This used to be commit dbe6ad014a8b5dcbf17d7cd9865650c2e040d666)
Diffstat (limited to 'source3/rpc_parse/parse_samr.c')
-rw-r--r-- | source3/rpc_parse/parse_samr.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index b325ed7f18..8f20a257ce 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -290,7 +290,7 @@ void sam_io_sid_stuff(char *desc, SAM_SID_STUFF *stf, prs_struct *ps, int depth prs_uint32("num_sids ", ps, depth, &(stf->num_sids )); prs_uint16("padding2 ", ps, depth, &(stf->padding2 )); - ASSERT_ARRAY(stf->sid, stf->num_sids); + SMB_ASSERT_ARRAY(stf->sid, stf->num_sids); for (i = 0; i < stf->num_sids; i++) { @@ -737,8 +737,8 @@ void make_samr_r_enum_dom_users(SAMR_R_ENUM_DOM_USERS *r_u, r_u->num_entries2 = num_sam_entries; r_u->num_entries3 = num_sam_entries; - ASSERT_ARRAY(r_u->sam, num_sam_entries); - ASSERT_ARRAY(r_u->uni_acct_name, num_sam_entries); + SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries); + SMB_ASSERT_ARRAY(r_u->uni_acct_name, num_sam_entries); for (i = 0; i < num_sam_entries; i++) { @@ -785,7 +785,7 @@ void samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struc prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2)); prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3)); - ASSERT_ARRAY(r_u->sam, r_u->num_entries2); + SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries2); for (i = 0; i < r_u->num_entries2; i++) { @@ -793,7 +793,7 @@ void samr_io_r_enum_dom_users(char *desc, SAMR_R_ENUM_DOM_USERS *r_u, prs_struc sam_io_sam_entry("", &(r_u->sam[i]), ps, depth); } - ASSERT_ARRAY(r_u->uni_acct_name, r_u->num_entries2); + SMB_ASSERT_ARRAY(r_u->uni_acct_name, r_u->num_entries2); for (i = 0; i < r_u->num_entries2; i++) { @@ -876,7 +876,7 @@ void make_samr_r_enum_dom_aliases(SAMR_R_ENUM_DOM_ALIASES *r_u, r_u->ptr_entries2 = 1; r_u->num_entries3 = num_sam_entries; - ASSERT_ARRAY(r_u->sam, num_sam_entries); + SMB_ASSERT_ARRAY(r_u->sam, num_sam_entries); for (i = 0; i < num_sam_entries; i++) { @@ -920,7 +920,7 @@ void samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES *r_u, prs_s prs_uint32("ptr_entries2", ps, depth, &(r_u->ptr_entries2)); prs_uint32("num_entries3", ps, depth, &(r_u->num_entries3)); - ASSERT_ARRAY(r_u->sam, r_u->num_entries); + SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries); for (i = 0; i < r_u->num_entries; i++) { @@ -1049,7 +1049,7 @@ void sam_io_sam_info_2(char *desc, SAM_INFO_2 *sam, prs_struct *ps, int depth) prs_uint32("num_entries2 ", ps, depth, &(sam->num_entries2 )); - ASSERT_ARRAY(sam->sam, sam->num_entries); + SMB_ASSERT_ARRAY(sam->sam, sam->num_entries); for (i = 0; i < sam->num_entries; i++) { @@ -1132,7 +1132,7 @@ void sam_io_sam_info_1(char *desc, SAM_INFO_1 *sam, prs_struct *ps, int depth) prs_uint32("num_entries2 ", ps, depth, &(sam->num_entries2 )); - ASSERT_ARRAY(sam->sam, sam->num_entries); + SMB_ASSERT_ARRAY(sam->sam, sam->num_entries); for (i = 0; i < sam->num_entries; i++) { @@ -1350,7 +1350,7 @@ void samr_io_r_enum_dom_groups(char *desc, SAMR_R_ENUM_DOM_GROUPS *r_u, prs_str prs_uint32("num_entries2 ", ps, depth, &(r_u->num_entries2 )); - ASSERT_ARRAY(r_u->sam, r_u->num_entries); + SMB_ASSERT_ARRAY(r_u->sam, r_u->num_entries); for (i = 0; i < r_u->num_entries; i++) { @@ -1514,7 +1514,7 @@ void samr_io_q_lookup_ids(char *desc, SAMR_Q_LOOKUP_IDS *q_u, prs_struct *ps, i prs_uint32("ptr ", ps, depth, &(q_u->ptr )); prs_uint32("num_sids2", ps, depth, &(q_u->num_sids2)); - ASSERT_ARRAY(q_u->ptr_sid, q_u->num_sids2); + SMB_ASSERT_ARRAY(q_u->ptr_sid, q_u->num_sids2); for (i = 0; i < q_u->num_sids2; i++) { @@ -1552,7 +1552,7 @@ void make_samr_r_lookup_ids(SAMR_R_LOOKUP_IDS *r_u, r_u->ptr = 1; r_u->num_entries2 = num_rids; - ASSERT_ARRAY(r_u->rid, num_rids); + SMB_ASSERT_ARRAY(r_u->rid, num_rids); for (i = 0; i < num_rids; i++) { @@ -1589,7 +1589,7 @@ void samr_io_r_lookup_ids(char *desc, SAMR_R_LOOKUP_IDS *r_u, prs_struct *ps, i if (r_u->num_entries != 0) { - ASSERT_ARRAY(r_u->rid, r_u->num_entries2); + SMB_ASSERT_ARRAY(r_u->rid, r_u->num_entries2); for (i = 0; i < r_u->num_entries2; i++) { @@ -1623,7 +1623,7 @@ void samr_io_q_lookup_names(char *desc, SAMR_Q_LOOKUP_NAMES *q_u, prs_struct *p prs_uint32("ptr ", ps, depth, &(q_u->ptr )); prs_uint32("num_rids2", ps, depth, &(q_u->num_rids2)); - ASSERT_ARRAY(q_u->hdr_user_name, q_u->num_rids2); + SMB_ASSERT_ARRAY(q_u->hdr_user_name, q_u->num_rids2); for (i = 0; i < q_u->num_rids2; i++) { @@ -1655,7 +1655,7 @@ void make_samr_r_lookup_names(SAMR_R_LOOKUP_NAMES *r_u, r_u->undoc_buffer = 1; r_u->num_entries2 = num_rids; - ASSERT_ARRAY(r_u->dom_rid, num_rids); + SMB_ASSERT_ARRAY(r_u->dom_rid, num_rids); for (i = 0; i < num_rids; i++) { @@ -1694,7 +1694,7 @@ void samr_io_r_lookup_names(char *desc, SAMR_R_LOOKUP_NAMES *r_u, prs_struct *p if (r_u->num_entries != 0) { - ASSERT_ARRAY(r_u->dom_rid, r_u->num_entries2); + SMB_ASSERT_ARRAY(r_u->dom_rid, r_u->num_entries2); for (i = 0; i < r_u->num_entries2; i++) { @@ -1727,7 +1727,7 @@ void make_samr_q_unknown_12(SAMR_Q_UNKNOWN_12 *q_u, q_u->ptr = 0; q_u->num_gids2 = num_gids; - ASSERT_ARRAY(q_u->gid, num_gids); + SMB_ASSERT_ARRAY(q_u->gid, num_gids); for (i = 0; i < num_gids; i++) { @@ -1758,7 +1758,7 @@ void samr_io_q_unknown_12(char *desc, SAMR_Q_UNKNOWN_12 *q_u, prs_struct *ps, i prs_uint32("ptr ", ps, depth, &(q_u->ptr )); prs_uint32("num_gids2", ps, depth, &(q_u->num_gids2)); - ASSERT_ARRAY(q_u->gid, q_u->num_gids2); + SMB_ASSERT_ARRAY(q_u->gid, q_u->num_gids2); for (i = 0; i < q_u->num_gids2; i++) { @@ -1792,7 +1792,7 @@ void make_samr_r_unknown_12(SAMR_R_UNKNOWN_12 *r_u, r_u->ptr_als_usrs = 1; r_u->num_als_usrs2 = num_aliases; - ASSERT_ARRAY(r_u->hdr_als_name, num_aliases); + SMB_ASSERT_ARRAY(r_u->hdr_als_name, num_aliases); for (i = 0; i < num_aliases; i++) { @@ -1836,7 +1836,7 @@ void samr_io_r_unknown_12(char *desc, SAMR_R_UNKNOWN_12 *r_u, prs_struct *ps, i if (r_u->ptr_aliases != 0 && r_u->num_aliases1 != 0) { - ASSERT_ARRAY(r_u->hdr_als_name, r_u->num_aliases2); + SMB_ASSERT_ARRAY(r_u->hdr_als_name, r_u->num_aliases2); for (i = 0; i < r_u->num_aliases2; i++) { @@ -1858,7 +1858,7 @@ void samr_io_r_unknown_12(char *desc, SAMR_R_UNKNOWN_12 *r_u, prs_struct *ps, i if (r_u->ptr_als_usrs != 0 && r_u->num_als_usrs1 != 0) { - ASSERT_ARRAY(r_u->num_als_usrs, r_u->num_als_usrs2); + SMB_ASSERT_ARRAY(r_u->num_als_usrs, r_u->num_als_usrs2); for (i = 0; i < r_u->num_als_usrs2; i++) { @@ -2020,7 +2020,7 @@ void samr_io_r_query_usergroups(char *desc, SAMR_R_QUERY_USERGROUPS *r_u, prs_s { prs_uint32("num_entries2", ps, depth, &(r_u->num_entries2)); - ASSERT_ARRAY(r_u->gid, r_u->num_entries2); + SMB_ASSERT_ARRAY(r_u->gid, r_u->num_entries2); for (i = 0; i < r_u->num_entries2; i++) { |