summaryrefslogtreecommitdiff
path: root/source3/nsswitch/winbind_nss.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-07-15 10:54:35 +0000
committerAndrew Tridgell <tridge@samba.org>2002-07-15 10:54:35 +0000
commit159118de5ce0999b96ebe7cd7dc823087b0cccf5 (patch)
treea36cd7cde4ee83b7ec420d883ca8bb86b307f831 /source3/nsswitch/winbind_nss.c
parentfc26773500cc549563bcd00b2657713adf09a840 (diff)
downloadsamba-159118de5ce0999b96ebe7cd7dc823087b0cccf5.tar.gz
samba-159118de5ce0999b96ebe7cd7dc823087b0cccf5.tar.bz2
samba-159118de5ce0999b96ebe7cd7dc823087b0cccf5.zip
fixed a number of real bugs found by warnings on the 64 bit irix compiler
(This used to be commit 04de6bbc8055e5547af41b10e284b722f40e726d)
Diffstat (limited to 'source3/nsswitch/winbind_nss.c')
-rw-r--r--source3/nsswitch/winbind_nss.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/winbind_nss.c b/source3/nsswitch/winbind_nss.c
index 5dc3d32279..594b5fbadb 100644
--- a/source3/nsswitch/winbind_nss.c
+++ b/source3/nsswitch/winbind_nss.c
@@ -593,7 +593,7 @@ BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize)
static NSS_STATUS fill_pwent(struct passwd *result,
struct winbindd_pw *pw,
- char **buffer, int *buflen)
+ char **buffer, size_t *buflen)
{
/* User name */
@@ -678,8 +678,8 @@ static NSS_STATUS fill_pwent(struct passwd *result,
the static data passed to us by libc to put strings and stuff in.
Return NSS_STATUS_TRYAGAIN if we run out of memory. */
-static int fill_grent(struct group *result, struct winbindd_gr *gr,
- char *gr_mem, char **buffer, int *buflen)
+static NSS_STATUS fill_grent(struct group *result, struct winbindd_gr *gr,
+ char *gr_mem, char **buffer, size_t *buflen)
{
fstring name;
int i;
@@ -722,7 +722,7 @@ static int fill_grent(struct group *result, struct winbindd_gr *gr,
/* this next value is a pointer to a pointer so let's align it */
/* Calculate number of extra bytes needed to align on pointer size boundry */
- if ((i = (int)*buffer % sizeof(char*)) != 0)
+ if ((i = (unsigned long)(*buffer) % sizeof(char*)) != 0)
i = sizeof(char*) - i;
if ((tst = get_static(buffer, buflen, ((gr->num_gr_mem + 1) *