this fixes the last of the issues where USRMGR.EXE and SRVMGR.EXE were

failing.  running these two programs on a samba pdc now work.


parse_samr.c:

- removed __LINE__ from debug macros.

- removed call to SMB_ASSERT_ARRAY() in samr_r_query_usergroups.  the
  DOM_GID array is a malloc'd array (by make_dom_gids) not a static
  array.


srv_samr.c:

- replaced all "struct smb_passwd"s with sam_passwds instead.  there
  were uid to rid confusion issues (assumptions that uids were equal
  to rids).

- #if 0'd the pdb_rid_is_user() call which, given the above corrections,
  would probably work now.


srv_util.c:

- replaced "struct smb_passwd" with sam_passwd in lookup_user_rid, as
  assumptions were being made that uids were equal to rids.

1 files changed, 4 insertions, 6 deletions

diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 71eb8a37dd8..e35bdd19d1e 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -355,7 +355,7 @@ static void make_sam_entry1(SAM_ENTRY1 *sam, uint32 user_idx,
 {
 	if (sam == NULL) return;
 
-	DEBUG(5,("make_sam_entry1: %d\n", __LINE__));
+	DEBUG(5,("make_sam_entry1\n"));
 
 	sam->user_idx = user_idx;
 	sam->rid_user = rid_user;
@@ -415,7 +415,7 @@ static void make_sam_entry2(SAM_ENTRY2 *sam, uint32 user_idx,
 {
 	if (sam == NULL) return;
 
-	DEBUG(5,("make_sam_entry2: %d\n", __LINE__));
+	DEBUG(5,("make_sam_entry2\n"));
 
 	sam->user_idx = user_idx;
 	sam->rid_user = rid_user;
@@ -472,7 +472,7 @@ static void make_sam_entry3(SAM_ENTRY3 *sam, uint32 grp_idx,
 {
 	if (sam == NULL) return;
 
-	DEBUG(5,("make_sam_entry3: %d\n", __LINE__));
+	DEBUG(5,("make_sam_entry3\n"));
 
 	sam->grp_idx = grp_idx;
 	sam->rid_grp = rid_grp;
@@ -510,7 +510,7 @@ static void make_sam_entry(SAM_ENTRY *sam, uint32 len_sam_name, uint32 rid)
 {
 	if (sam == NULL) return;
 
-	DEBUG(5,("make_sam_entry: %d\n", __LINE__));
+	DEBUG(5,("make_sam_entry\n"));
 
 	sam->rid = rid;
 	make_uni_hdr(&(sam->hdr_name), len_sam_name, len_sam_name, len_sam_name != 0);
@@ -1744,8 +1744,6 @@ 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));
 
-			SMB_ASSERT_ARRAY(r_u->gid, r_u->num_entries2);
-
 			for (i = 0; i < r_u->num_entries2; i++)
 			{
 				smb_io_gid("", &(r_u->gid[i]), ps, depth);