The branch, master has been updated
via f7b4209 Fix one more warning introduced by changing the size of
UNIX_USER_TOKEN->ngroups from size_t to uint32_t.
via 8238357 Fix warning introduced by changing the size of
UNIX_USER_TOKEN->ngroups from size_t to uint32_t.
via 410f9fa Fix "cast from pointer to integer of different size"
warnings on a 64-bit machine.
from b077ccc ntvfs: Add some missing dependencies on tevent/events.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f7b4209f999d9c5310865381b1598668f9bcb98f
Author: Jeremy Allison <[email protected]>
Date: Mon Feb 28 12:38:18 2011 -0800
Fix one more warning introduced by changing the size of
UNIX_USER_TOKEN->ngroups from size_t to uint32_t.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Mon Feb 28 22:43:50 CET 2011 on sn-devel-104
commit 8238357ac77d81a18f3faa822dafba954bba7b86
Author: Jeremy Allison <[email protected]>
Date: Mon Feb 28 12:31:53 2011 -0800
Fix warning introduced by changing the size of UNIX_USER_TOKEN->ngroups
from size_t to uint32_t.
commit 410f9fad6c49e1af4e9700331aa2e1ed16f51b27
Author: Jeremy Allison <[email protected]>
Date: Mon Feb 28 12:25:40 2011 -0800
Fix "cast from pointer to integer of different size" warnings on a 64-bit
machine.
-----------------------------------------------------------------------
Summary of changes:
lib/tevent/tevent_poll.c | 14 +++++++-------
source3/passdb/pdb_wbc_sam.c | 2 +-
source3/smbd/sec_ctx.c | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c
index c133194..cda028a 100644
--- a/lib/tevent/tevent_poll.c
+++ b/lib/tevent/tevent_poll.c
@@ -64,7 +64,7 @@ static int poll_event_fd_destructor(struct tevent_fd *fde)
struct tevent_context *ev = fde->event_ctx;
struct poll_event_context *poll_ev = NULL;
struct tevent_fd *moved_fde;
- int del_idx;
+ long del_idx;
if (ev == NULL) {
goto done;
@@ -76,7 +76,7 @@ static int poll_event_fd_destructor(struct tevent_fd *fde)
/*
* Assume a void * can carry enough bits to hold num_fds.
*/
- del_idx = (int)(fde->additional_data);
+ del_idx = (long)(fde->additional_data);
moved_fde = poll_ev->fd_events[poll_ev->num_fds-1];
poll_ev->fd_events[del_idx] = moved_fde;
@@ -152,7 +152,7 @@ static struct tevent_fd *poll_event_add_fd(struct
tevent_context *ev,
/*
* Assume a void * can carry enough bits to hold num_fds.
*/
- fde->additional_data = (void *)poll_ev->num_fds;
+ fde->additional_data = (void *)(long)poll_ev->num_fds;
poll_ev->fd_events[poll_ev->num_fds] = fde;
poll_ev->num_fds += 1;
@@ -169,7 +169,7 @@ static void poll_event_set_fd_flags(struct tevent_fd *fde,
uint16_t flags)
{
struct poll_event_context *poll_ev = talloc_get_type_abort(
fde->event_ctx->additional_data, struct poll_event_context);
- int idx;
+ long idx;
uint16_t pollflags = 0;
if (flags & TEVENT_FD_READ) {
@@ -179,7 +179,7 @@ static void poll_event_set_fd_flags(struct tevent_fd *fde,
uint16_t flags)
pollflags |= (POLLOUT);
}
- idx = (int)(fde->additional_data);
+ idx = (long)(fde->additional_data);
poll_ev->fds[idx].events = pollflags;
fde->flags = flags;
@@ -237,10 +237,10 @@ static int poll_event_loop_poll(struct tevent_context *ev,
the handler to remove itself when called */
for (fde = ev->fd_events; fde; fde = fde->next) {
struct pollfd *pfd;
- int pfd_idx;
+ long pfd_idx;
uint16_t flags = 0;
- pfd_idx = (int)(fde->additional_data);
+ pfd_idx = (long)(fde->additional_data);
pfd = &poll_ev->fds[pfd_idx];
diff --git a/source3/passdb/pdb_wbc_sam.c b/source3/passdb/pdb_wbc_sam.c
index e90cd10..9af8e4f 100644
--- a/source3/passdb/pdb_wbc_sam.c
+++ b/source3/passdb/pdb_wbc_sam.c
@@ -95,7 +95,7 @@ static NTSTATUS pdb_wbc_sam_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;
const char *username = pdb_get_username(user);
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 54ee7ac..a7479ed 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -132,7 +132,7 @@ static void gain_root(void)
Get the list of current groups.
****************************************************************************/
-static int get_current_groups(gid_t gid, size_t *p_ngroups, gid_t **p_groups)
+static int get_current_groups(gid_t gid, uint32_t *p_ngroups, gid_t **p_groups)
{
int i;
gid_t grp;
--
Samba Shared Repository
