Changed ASSERT macros to SMB_ASSERT macros as some systems already

have an ASSERT macro defined.
Jeremy.
(This used to be commit dbe6ad014a8b5dcbf17d7cd9865650c2e040d666)

3 files changed, 11 insertions, 11 deletions

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;
     }