s4:s3compat Fix pdb_samba4 after changes to dsdb_enum_group_mem()
authorAndrew Bartlett <abartlet@samba.org>
Mon, 24 May 2010 23:22:16 +0000 (09:22 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 3 Jun 2010 11:57:33 +0000 (21:57 +1000)
The prototype fordsdb_enum_group_mem() was changed to use unsigned
int, so we need to follow up here.

Adnrew Bartlett

source4/s3compat/pdb_samba4.c

index 36312d36dbdc42bb75c6b91286e4f60b0537c76b..135188b44bafea2db0d3fd5b84fbb1424600d7c9 100644 (file)
@@ -706,7 +706,7 @@ static NTSTATUS pdb_samba4_enum_group_members(struct pdb_methods *m,
                                           uint32_t **pmembers,
                                           size_t *pnum_members)
 {
-       size_t i, num_sids, num_members;
+       unsigned int i, num_sids, num_members;
        struct pdb_samba4_state *state = talloc_get_type_abort(
                m->private_data, struct pdb_samba4_state);
        struct dom_sid *members_as_sids;
@@ -1117,6 +1117,7 @@ static NTSTATUS pdb_samba4_enum_aliasmem(struct pdb_methods *m,
        struct pdb_samba4_state *state = talloc_get_type_abort(
                m->private_data, struct pdb_samba4_state);
        struct ldb_dn *dn;
+       unsigned int num_members;
        NTSTATUS status;
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
        NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
@@ -1126,7 +1127,8 @@ static NTSTATUS pdb_samba4_enum_aliasmem(struct pdb_methods *m,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = dsdb_enum_group_mem(state->ldb, mem_ctx, dn, pmembers, pnum_members);
+       status = dsdb_enum_group_mem(state->ldb, mem_ctx, dn, pmembers, &num_members);
+       *pnum_members = num_members;
        if (NT_STATUS_IS_OK(status)) {
                talloc_steal(mem_ctx, pmembers);
        }