From 8afc9c80ac11649f06e5517d819dbf201c941acb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 24 Aug 1998 21:49:10 +0000 Subject: Changed ASSERT macros to SMB_ASSERT macros as some systems already have an ASSERT macro defined. Jeremy. (This used to be commit dbe6ad014a8b5dcbf17d7cd9865650c2e040d666) --- source3/include/smb.h | 4 ++-- source3/lib/util.c | 2 +- source3/lsarpcd/srv_lsa.c | 8 ++++---- source3/param/loadparm.c | 2 +- source3/rpc_parse/parse_lsa.c | 14 +++++++------- source3/rpc_parse/parse_net.c | 6 +++--- source3/rpc_parse/parse_samr.c | 44 +++++++++++++++++++++--------------------- source3/rpc_parse/parse_srv.c | 8 ++++---- source3/rpc_server/srv_lsa.c | 8 ++++---- source3/rpc_server/srv_samr.c | 8 ++++---- source3/rpc_server/srv_util.c | 6 +++--- source3/smbd/ipc.c | 2 +- source3/smbd/password.c | 4 ++-- 13 files changed, 58 insertions(+), 58 deletions(-) (limited to 'source3') diff --git a/source3/include/smb.h b/source3/include/smb.h index 9dc1ff5f38..0a49b72a27 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1561,10 +1561,10 @@ extern int unix_ERR_code; /* useful macros */ #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) -#define ASSERT(b) ((b)?0: \ +#define SMB_ASSERT(b) ((b)?(void)0: \ (DEBUG(0,("PANIC: assert failed at %s(%d)\n", \ __FILE__, __LINE__)), smb_panic("assert failed"))) -#define ASSERT_ARRAY(a,n) ASSERT((sizeof(a)/sizeof((a)[0])) >= (n)) +#define SMB_ASSERT_ARRAY(a,n) SMB_ASSERT((sizeof(a)/sizeof((a)[0])) >= (n)) #endif /* _SMB_H */ diff --git a/source3/lib/util.c b/source3/lib/util.c index 28c7182250..4604836f77 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -379,7 +379,7 @@ char *StrCpy(char *dest,char *src) char *d = dest; /* I don't want to get lazy with these ... */ - ASSERT(dest && src); + SMB_ASSERT(dest && src); if (!dest) return(NULL); if (!src) { diff --git a/source3/lsarpcd/srv_lsa.c b/source3/lsarpcd/srv_lsa.c index d2ca2d7a76..0675743eee 100644 --- a/source3/lsarpcd/srv_lsa.c +++ b/source3/lsarpcd/srv_lsa.c @@ -163,7 +163,7 @@ static void make_reply_lookup_rids(LSA_R_LOOKUP_RIDS *r_l, r_l->undoc_buffer = 1; r_l->num_entries2 = num_entries; - ASSERT_ARRAY(r_l->dom_rid, num_entries); + SMB_ASSERT_ARRAY(r_l->dom_rid, num_entries); for (i = 0; i < num_entries; i++) { @@ -184,7 +184,7 @@ static void make_lsa_trans_names(LSA_TRANS_NAME_ENUM *trn, int i; (*total) = 0; - ASSERT(num_entries <= MAX_LOOKUP_SIDS); + SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS); for (i = 0; i < num_entries; i++) { @@ -196,7 +196,7 @@ static void make_lsa_trans_names(LSA_TRANS_NAME_ENUM *trn, trn->ptr_name[i] = 0; trn->ptr_name[(*total)] = 0; - ASSERT_ARRAY(sid[i].sid.sub_auths, num_auths); + SMB_ASSERT_ARRAY(sid[i].sid.sub_auths, num_auths); /* find the rid to look up */ if (num_auths != 0) @@ -403,7 +403,7 @@ static void api_lsa_lookup_names( int uid, prs_struct *data, string_to_sid(&sid_S_1_3, "S-1-3"); string_to_sid(&sid_S_1_5, "S-1-5"); - ASSERT_ARRAY(q_l.lookup_name, q_l.num_entries); + SMB_ASSERT_ARRAY(q_l.lookup_name, q_l.num_entries); /* convert received RIDs to strings, so we can do them. */ for (i = 0; i < q_l.num_entries; i++) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 765fae4f5c..c2f7837aa8 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1068,7 +1068,7 @@ FN_GLOBAL_STRING(lp_nis_home_map_name,&Globals.szNISHomeMapName) FN_GLOBAL_STRING(lp_announce_version,&Globals.szAnnounceVersion) FN_GLOBAL_STRING(lp_netbios_aliases,&Globals.szNetbiosAliases) FN_GLOBAL_STRING(lp_driverfile,&Globals.szDriverFile) -FN_GLOBAL_STRING(lp_panic_action,&Globals.szPanicAction); +FN_GLOBAL_STRING(lp_panic_action,&Globals.szPanicAction) FN_GLOBAL_STRING(lp_domain_sid,&Globals.szDomainSID) FN_GLOBAL_STRING(lp_domain_other_sids,&Globals.szDomainOtherSIDs) diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c index 272e76eefe..638222590d 100644 --- a/source3/rpc_parse/parse_lsa.c +++ b/source3/rpc_parse/parse_lsa.c @@ -82,7 +82,7 @@ void lsa_io_dom_r_ref(char *desc, DOM_R_REF *r_r, prs_struct *ps, int depth) smb_io_unihdr2("", &(r_r->hdr_dom_name), ps, depth); /* domain name unicode string header */ - ASSERT_ARRAY(r_r->hdr_ref_dom, r_r->num_ref_doms_1-1); + SMB_ASSERT_ARRAY(r_r->hdr_ref_dom, r_r->num_ref_doms_1-1); for (i = 0; i < r_r->num_ref_doms_1-1; i++) { @@ -91,7 +91,7 @@ void lsa_io_dom_r_ref(char *desc, DOM_R_REF *r_r, prs_struct *ps, int depth) smb_io_unistr("", &(r_r->uni_dom_name), ps, depth); /* domain name unicode string */ - ASSERT_ARRAY(r_r->ref_dom, r_r->num_ref_doms_2); + SMB_ASSERT_ARRAY(r_r->ref_dom, r_r->num_ref_doms_2); for (i = 0; i < r_r->num_ref_doms_2; i++) { @@ -417,7 +417,7 @@ void lsa_io_sid_enum(char *desc, LSA_SID_ENUM *sen, prs_struct *ps, int depth) prs_uint32("ptr_sid_enum", ps, depth, &(sen->ptr_sid_enum)); prs_uint32("num_entries2", ps, depth, &(sen->num_entries2)); - ASSERT_ARRAY(sen->ptr_sid, sen->num_entries); + SMB_ASSERT_ARRAY(sen->ptr_sid, sen->num_entries); for (i = 0; i < sen->num_entries; i++) { @@ -426,7 +426,7 @@ void lsa_io_sid_enum(char *desc, LSA_SID_ENUM *sen, prs_struct *ps, int depth) prs_uint32(temp, ps, depth, &(sen->ptr_sid[i])); /* domain SID pointers to be looked up. */ } - ASSERT_ARRAY(sen->sid, sen->num_entries); + SMB_ASSERT_ARRAY(sen->sid, sen->num_entries); for (i = 0; i < sen->num_entries; i++) { @@ -475,7 +475,7 @@ void lsa_io_trans_names(char *desc, LSA_TRANS_NAME_ENUM *trn, prs_struct *ps, in prs_uint32("ptr_trans_names", ps, depth, &(trn->ptr_trans_names)); prs_uint32("num_entries2 ", ps, depth, &(trn->num_entries2)); - ASSERT_ARRAY(trn->ptr_name, trn->num_entries); + SMB_ASSERT_ARRAY(trn->ptr_name, trn->num_entries); for (i = 0; i < trn->num_entries; i++) { @@ -537,7 +537,7 @@ void lsa_io_q_lookup_rids(char *desc, LSA_Q_LOOKUP_RIDS *q_r, prs_struct *ps, i prs_uint32("buffer_dom_sid ", ps, depth, &(q_r->buffer_dom_sid)); /* undocumented domain SID buffer pointer */ prs_uint32("buffer_dom_name", ps, depth, &(q_r->buffer_dom_name)); /* undocumented domain name buffer pointer */ - ASSERT_ARRAY(q_r->lookup_name, q_r->num_entries); + SMB_ASSERT_ARRAY(q_r->lookup_name, q_r->num_entries); for (i = 0; i < q_r->num_entries; i++) { @@ -567,7 +567,7 @@ void lsa_io_r_lookup_rids(char *desc, LSA_R_LOOKUP_RIDS *r_r, prs_struct *ps, i prs_uint32("undoc_buffer", ps, depth, &(r_r->undoc_buffer)); prs_uint32("num_entries2", ps, depth, &(r_r->num_entries2)); - ASSERT_ARRAY(r_r->dom_rid, r_r->num_entries2); + SMB_ASSERT_ARRAY(r_r->dom_rid, r_r->num_entries2); for (i = 0; i < r_r->num_entries2; i++) { diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index 8a15ae6bb4..744bd455c9 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -984,7 +984,7 @@ void make_net_user_info3(NET_USER_INFO_3 *usr, usr->num_groups2 = num_groups; - ASSERT_ARRAY(usr->gids, num_groups); + SMB_ASSERT_ARRAY(usr->gids, num_groups); for (i = 0; i < num_groups; i++) { @@ -1060,7 +1060,7 @@ void net_io_user_info3(char *desc, NET_USER_INFO_3 *usr, prs_struct *ps, int de prs_align(ps); prs_uint32("num_groups2 ", ps, depth, &(usr->num_groups2)); /* num groups */ - ASSERT_ARRAY(usr->gids, usr->num_groups2); + SMB_ASSERT_ARRAY(usr->gids, usr->num_groups2); for (i = 0; i < usr->num_groups2; i++) { smb_io_gid("", &(usr->gids[i]), ps, depth); /* group info */ @@ -1071,7 +1071,7 @@ void net_io_user_info3(char *desc, NET_USER_INFO_3 *usr, prs_struct *ps, int de smb_io_dom_sid2("", &(usr->dom_sid), ps, depth); /* domain SID */ - ASSERT_ARRAY(usr->other_sids, usr->num_other_sids); + SMB_ASSERT_ARRAY(usr->other_sids, usr->num_other_sids); for (i = 0; i < usr->num_other_sids; i++) { 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++) { diff --git a/source3/rpc_parse/parse_srv.c b/source3/rpc_parse/parse_srv.c index 44e3ef827b..a66699b95c 100644 --- a/source3/rpc_parse/parse_srv.c +++ b/source3/rpc_parse/parse_srv.c @@ -114,7 +114,7 @@ void srv_io_srv_share_info_1(char *desc, SRV_SHARE_INFO_1 *ctr, prs_struct *ps, prs_uint32("num_entries_read2", ps, depth, &(ctr->num_entries_read2)); - ASSERT_ARRAY(ctr->info_1, num_entries); + SMB_ASSERT_ARRAY(ctr->info_1, num_entries); for (i = 0; i < num_entries; i++) { @@ -238,7 +238,7 @@ void srv_io_srv_share_info_2(char *desc, SRV_SHARE_INFO_2 *ctr, prs_struct *ps, prs_uint32("num_entries_read2", ps, depth, &(ctr->num_entries_read2)); - ASSERT_ARRAY(ctr->info_2, num_entries); + SMB_ASSERT_ARRAY(ctr->info_2, num_entries); for (i = 0; i < num_entries; i++) { @@ -451,7 +451,7 @@ void srv_io_srv_sess_info_0(char *desc, SRV_SESS_INFO_0 *ss0, prs_struct *ps, i prs_uint32("num_entries_read2", ps, depth, &(ss0->num_entries_read2)); - ASSERT_ARRAY(ss0->info_0, num_entries); + SMB_ASSERT_ARRAY(ss0->info_0, num_entries); for (i = 0; i < num_entries; i++) { @@ -566,7 +566,7 @@ void srv_io_srv_sess_info_1(char *desc, SRV_SESS_INFO_1 *ss1, prs_struct *ps, i prs_uint32("num_entries_read2", ps, depth, &(ss1->num_entries_read2)); - ASSERT_ARRAY(ss1->info_1, num_entries); + SMB_ASSERT_ARRAY(ss1->info_1, num_entries); for (i = 0; i < num_entries; i++) { diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c index d2ca2d7a76..0675743eee 100644 --- a/source3/rpc_server/srv_lsa.c +++ b/source3/rpc_server/srv_lsa.c @@ -163,7 +163,7 @@ static void make_reply_lookup_rids(LSA_R_LOOKUP_RIDS *r_l, r_l->undoc_buffer = 1; r_l->num_entries2 = num_entries; - ASSERT_ARRAY(r_l->dom_rid, num_entries); + SMB_ASSERT_ARRAY(r_l->dom_rid, num_entries); for (i = 0; i < num_entries; i++) { @@ -184,7 +184,7 @@ static void make_lsa_trans_names(LSA_TRANS_NAME_ENUM *trn, int i; (*total) = 0; - ASSERT(num_entries <= MAX_LOOKUP_SIDS); + SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS); for (i = 0; i < num_entries; i++) { @@ -196,7 +196,7 @@ static void make_lsa_trans_names(LSA_TRANS_NAME_ENUM *trn, trn->ptr_name[i] = 0; trn->ptr_name[(*total)] = 0; - ASSERT_ARRAY(sid[i].sid.sub_auths, num_auths); + SMB_ASSERT_ARRAY(sid[i].sid.sub_auths, num_auths); /* find the rid to look up */ if (num_auths != 0) @@ -403,7 +403,7 @@ static void api_lsa_lookup_names( int uid, prs_struct *data, string_to_sid(&sid_S_1_3, "S-1-3"); string_to_sid(&sid_S_1_5, "S-1-5"); - ASSERT_ARRAY(q_l.lookup_name, q_l.num_entries); + SMB_ASSERT_ARRAY(q_l.lookup_name, q_l.num_entries); /* convert received RIDs to strings, so we can do them. */ for (i = 0; i < q_l.num_entries; i++) diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index b0742d0e34..95b0a413c7 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -236,7 +236,7 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u, user_sid = global_machine_sid; - ASSERT_ARRAY(user_sid.sub_auths, user_sid.num_auths+1); + SMB_ASSERT_ARRAY(user_sid.sub_auths, user_sid.num_auths+1); /* * Add the user RID. @@ -613,7 +613,7 @@ static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u, #if 0 int i; - ASSERT_ARRAY(q_u->uni_user_name, num_rids); + SMB_ASSERT_ARRAY(q_u->uni_user_name, num_rids); for (i = 0; i < num_rids && status == 0; i++) { @@ -689,7 +689,7 @@ static void samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u, DEBUG(5,("samr_lookup_names: truncating entries to %d\n", num_rids)); } - ASSERT_ARRAY(q_u->uni_user_name, num_rids); + SMB_ASSERT_ARRAY(q_u->uni_user_name, num_rids); for (i = 0; i < num_rids && status == 0; i++) { @@ -898,7 +898,7 @@ static BOOL get_user_info_21(SAM_USER_INFO_21 *id21, uint32 user_rid) /* create a LOGON_HRS structure */ hrs.len = sam_pass->hours_len; - ASSERT_ARRAY(hrs.hours, hrs.len); + SMB_ASSERT_ARRAY(hrs.hours, hrs.len); for (i = 0; i < hrs.len; i++) { hrs.hours[i] = sam_pass->hours[i]; diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c index 80e10a3d3a..6c47db04bf 100644 --- a/source3/rpc_server/srv_util.c +++ b/source3/rpc_server/srv_util.c @@ -94,7 +94,7 @@ BOOL lookup_wellknown_sid_from_name(char *windows_name, DOM_SID *psid) rnp = &builtin_alias_rids[i]; if(strequal(rnp->name, windows_name)) { string_to_sid( psid, "S-1-5-32" ); - ASSERT_ARRAY(psid->sub_auths, psid->num_auths+1); + SMB_ASSERT_ARRAY(psid->sub_auths, psid->num_auths+1); psid->sub_auths[psid->num_auths++] = rnp->rid; return True; } @@ -104,7 +104,7 @@ BOOL lookup_wellknown_sid_from_name(char *windows_name, DOM_SID *psid) rnp = &domain_user_rids[i]; if(strequal(rnp->name, windows_name)) { *psid = global_machine_sid; - ASSERT_ARRAY(psid->sub_auths, psid->num_auths+1); + SMB_ASSERT_ARRAY(psid->sub_auths, psid->num_auths+1); psid->sub_auths[psid->num_auths++] = rnp->rid; return True; } @@ -114,7 +114,7 @@ BOOL lookup_wellknown_sid_from_name(char *windows_name, DOM_SID *psid) rnp = &domain_group_rids[i]; if(strequal(rnp->name, windows_name)) { *psid = global_machine_sid; - ASSERT_ARRAY(psid->sub_auths, psid->num_auths+1); + SMB_ASSERT_ARRAY(psid->sub_auths, psid->num_auths+1); psid->sub_auths[psid->num_auths++] = rnp->rid; return True; } diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c index 46fb6a22ff..70c2668d92 100644 --- a/source3/smbd/ipc.c +++ b/source3/smbd/ipc.c @@ -373,7 +373,7 @@ va_dcl } #if CHECK_TYPES str = va_arg(args,char*); - ASSERT(strncmp(str,p->curpos,strlen(str)) == 0); + SMB_ASSERT(strncmp(str,p->curpos,strlen(str)) == 0); #endif stringneeded = -1; diff --git a/source3/smbd/password.c b/source3/smbd/password.c index 121ebb7f00..ecc86f29ec 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -1191,8 +1191,8 @@ machine %s in domain %s.\n", global_myname, global_myworkgroup )); trust_password_unlock(); /* - * Here we should check the last change time to see if the machine - * password needs changing..... TODO... JRA. + * Here we check the last change time to see if the machine + * password needs changing. JRA. */ if(time(NULL) > lct + lp_machine_password_timeout()) -- cgit