/* 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 */
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) {
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++)
{
int i;
(*total) = 0;
- ASSERT(num_entries <= MAX_LOOKUP_SIDS);
+ SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
for (i = 0; i < num_entries; i++)
{
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)
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++)
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)
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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 */
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
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++)
{
int i;
(*total) = 0;
- ASSERT(num_entries <= MAX_LOOKUP_SIDS);
+ SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
for (i = 0; i < num_entries; i++)
{
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)
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++)
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.
#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++)
{
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++)
{
/* 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];
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;
}
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;
}
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;
}
}
#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;
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())