r22586: Add a modified version of Simo's patch.

Jeremy.

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 80b1b93a506a15c48040be7f63687c3963f474c2..8f7bfd6b01977c05a965fb0db6240877f43e1e1c 100644 (file)
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -949,6 +949,7 @@ NTSTATUS _samr_enum_dom_users(pipes_struct *p, SAMR_Q_ENUM_DOM_USERS *q_u,
        if (num_account == 0) {
                DEBUG(5, ("_samr_enum_dom_users: enumeration handle over "
                          "total entries\n"));
+               init_samr_r_enum_dom_users(r_u, q_u->start_idx, 0);
                return NT_STATUS_OK;
        }
 
@@ -1708,7 +1709,7 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK
        UNIHDR *hdr_name = NULL;
        UNISTR2 *uni_name = NULL;
        DOM_SID pol_sid;
-       int num_rids = q_u->num_rids1;
+       int num_rids = (int)q_u->num_rids1;
        uint32 acc_granted;
        int i;
 
@@ -1726,12 +1727,18 @@ NTSTATUS _samr_lookup_rids(pipes_struct *p, SAMR_Q_LOOKUP_RIDS *q_u, SAMR_R_LOOK
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       names = TALLOC_ZERO_ARRAY(p->mem_ctx, const char *, num_rids);
-       attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, enum lsa_SidType, num_rids);
-       wire_attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, uint32, num_rids);
+       if (num_rids) {
+               names = TALLOC_ZERO_ARRAY(p->mem_ctx, const char *, num_rids);
+               attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, enum lsa_SidType, num_rids);
+               wire_attrs = TALLOC_ZERO_ARRAY(p->mem_ctx, uint32, num_rids);
 
-       if ((num_rids != 0) && ((names == NULL) || (attrs == NULL) || (wire_attrs==NULL)))
-               return NT_STATUS_NO_MEMORY;
+               if ((names == NULL) || (attrs == NULL) || (wire_attrs==NULL))
+                       return NT_STATUS_NO_MEMORY;
+       } else {
+               names = NULL;
+               attrs = NULL;
+               wire_attrs = NULL;
+       }
 
        become_root();  /* lookup_sid can require root privs */
        r_u->status = pdb_lookup_rids(&pol_sid, num_rids, q_u->rid,
@@ -3803,10 +3810,14 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u,
            !sid_check_is_builtin(&info->sid))
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-       members = TALLOC_ARRAY(p->mem_ctx, DOM_SID, q_u->num_sids1);
+       if (q_u->num_sids1) {
+               members = TALLOC_ARRAY(p->mem_ctx, DOM_SID, q_u->num_sids1);
 
-       if (members == NULL)
-               return NT_STATUS_NO_MEMORY;
+               if (members == NULL)
+                       return NT_STATUS_NO_MEMORY;
+       } else {
+               members = NULL;
+       }
 
        for (i=0; i<q_u->num_sids1; i++)
                sid_copy(&members[i], &q_u->sid[i].sid);
@@ -3864,10 +3875,14 @@ NTSTATUS _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_
                return status;
        }
 
-       sid = TALLOC_ZERO_ARRAY(p->mem_ctx, DOM_SID2, num_sids);        
-       if (num_sids!=0 && sid == NULL) {
-               SAFE_FREE(sids);
-               return NT_STATUS_NO_MEMORY;
+       if (num_sids) {
+               sid = TALLOC_ZERO_ARRAY(p->mem_ctx, DOM_SID2, num_sids);        
+               if (sid == NULL) {
+                       SAFE_FREE(sids);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       } else {
+               sid = NULL;
        }
 
        for (i = 0; i < num_sids; i++) {