summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-02-21 10:30:28 +0100
committerAndrew Bartlett <abartlet@samba.org>2011-02-22 16:20:11 +1100
commitd7fa34905223ebbf02dadcea0720062a30c3bbab (patch)
tree5b3a47f4a3d9dc26b25ee901fbcd72347ebeb516 /source3/passdb
parent2e69e894566d32001120d76d7ba58cdacb56d279 (diff)
downloadsamba-d7fa34905223ebbf02dadcea0720062a30c3bbab.tar.gz
samba-d7fa34905223ebbf02dadcea0720062a30c3bbab.tar.bz2
samba-d7fa34905223ebbf02dadcea0720062a30c3bbab.zip
s3:auth: change num_groups to from size_t to uint32_t
This will help with the change from UNIX_USER_TOKEN to security_unix_token metze
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/pdb_interface.c10
-rw-r--r--source3/passdb/pdb_ldap.c8
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index c286cc18f7..8cdaaaa569 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -843,7 +843,7 @@ NTSTATUS pdb_enum_group_members(TALLOC_CTX *mem_ctx,
NTSTATUS pdb_enum_group_memberships(TALLOC_CTX *mem_ctx, struct samu *user,
struct dom_sid **pp_sids, gid_t **pp_gids,
- size_t *p_num_groups)
+ uint32_t *p_num_groups)
{
struct pdb_methods *pdb = pdb_get_methods();
return pdb->enum_group_memberships(
@@ -888,7 +888,7 @@ static bool pdb_user_in_group(TALLOC_CTX *mem_ctx, struct samu *account,
{
struct dom_sid *sids;
gid_t *gids;
- size_t i, num_groups;
+ uint32_t i, num_groups;
if (!NT_STATUS_IS_OK(pdb_enum_group_memberships(mem_ctx, account,
&sids, &gids,
@@ -1438,7 +1438,7 @@ static bool pdb_default_sid_to_id(struct pdb_methods *methods,
return ret;
}
-static bool get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, size_t *p_num)
+static bool get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, uint32_t *p_num)
{
struct group *grp;
char **gr;
@@ -1501,7 +1501,7 @@ static NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods,
{
gid_t gid;
uid_t *uids;
- size_t i, num_uids;
+ uint32_t i, num_uids;
*pp_member_rids = NULL;
*p_num_members = 0;
@@ -1540,7 +1540,7 @@ static NTSTATUS pdb_default_enum_group_memberships(struct pdb_methods *methods,
struct samu *user,
struct dom_sid **pp_sids,
gid_t **pp_gids,
- size_t *p_num_groups)
+ uint32_t *p_num_groups)
{
size_t i;
gid_t gid;
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 573c50520e..5b34f6e026 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2080,7 +2080,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
struct samu *user,
struct dom_sid **pp_sids,
gid_t **pp_gids,
- size_t *p_num_groups);
+ uint32_t *p_num_groups);
static NTSTATUS ldapsam_rename_sam_account(struct pdb_methods *my_methods,
struct samu *old_acct,
@@ -2902,7 +2902,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
struct samu *user,
struct dom_sid **pp_sids,
gid_t **pp_gids,
- size_t *p_num_groups)
+ uint32_t *p_num_groups)
{
struct ldapsam_privates *ldap_state =
(struct ldapsam_privates *)methods->private_data;
@@ -2915,7 +2915,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
LDAPMessage *entry;
NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
uint32_t num_sids;
- size_t num_gids;
+ uint32_t num_gids;
char *gidstr;
gid_t primary_gid = -1;
@@ -5536,7 +5536,7 @@ static NTSTATUS ldapsam_delete_user(struct pdb_methods *my_methods, TALLOC_CTX *
NTSTATUS status;
struct dom_sid *sids = NULL;
gid_t *gids = NULL;
- size_t num_groups = 0;
+ uint32_t num_groups = 0;
int i;
uint32_t user_rid = pdb_get_user_rid(sam_acct);