diff options
| author | Jeremy Allison <jra@samba.org> | 2006-01-23 23:19:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:06:13 -0500 |
| commit | b3109006c5b273e5960d71b25787f23bf62ec17f (patch) | |
| tree | ea96faf9ce35ebbe24bf447d76f2eecf9c4737b3 | |
| parent | 19907887fcc1fa96f947298da752f410eb23ad1e (diff) | |
| download | samba-b3109006c5b273e5960d71b25787f23bf62ec17f.tar.gz samba-b3109006c5b273e5960d71b25787f23bf62ec17f.tar.bz2 samba-b3109006c5b273e5960d71b25787f23bf62ec17f.zip | |
r13095: Fix warnings assigning int to a size_t.
Jeremy.
(This used to be commit 1ca4abffd04bcc46b61acdc12444f3e2aad0afed)
| -rw-r--r-- | source3/include/auth.h | 2 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 | ||||
| -rw-r--r-- | source3/smbd/service.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h index f3dae1108b..03206c03c6 100644 --- a/source3/include/auth.h +++ b/source3/include/auth.h @@ -58,7 +58,7 @@ typedef struct auth_serversupplied_info { gid_t gid; /* This groups info is needed for when we become_user() for this uid */ - int n_groups; + size_t n_groups; gid_t *groups; /* NT group information taken from the info3 structure */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 6ceb4ec1cd..f899a71dc6 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -514,7 +514,7 @@ typedef struct connection_struct /* following groups stuff added by ih */ /* This groups info is valid for the user that *opened* the connection */ - int ngroups; + size_t ngroups; gid_t *groups; NT_USER_TOKEN *nt_user_token; diff --git a/source3/smbd/service.c b/source3/smbd/service.c index fb9dbf0489..7640559d53 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -592,6 +592,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, } if (conn->force_user || conn->force_group) { + int ngroups = 0; /* groups stuff added by ih */ conn->ngroups = 0; @@ -600,7 +601,8 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, /* Find all the groups this uid is in and store them. Used by change_to_user() */ initialise_groups(conn->user, conn->uid, conn->gid); - get_current_groups(conn->gid, &conn->ngroups,&conn->groups); + get_current_groups(conn->gid, &ngroups, &conn->groups); + conn->ngroups = ngroups; conn->nt_user_token = create_nt_token(conn->uid, conn->gid, |