diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-07-15 11:16:26 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-07-15 11:16:26 +0000 |
| commit | b0b28531c8cd76d3fcd95da08389d8a4d2e631a3 (patch) | |
| tree | f6a31e883573fc26a93e6bc0529d36eefe734eae /source3/nsswitch | |
| parent | e90b65284812aaa5ff9e9935ce9bbad7791cbbcd (diff) | |
| download | samba-b0b28531c8cd76d3fcd95da08389d8a4d2e631a3.tar.gz samba-b0b28531c8cd76d3fcd95da08389d8a4d2e631a3.tar.bz2 samba-b0b28531c8cd76d3fcd95da08389d8a4d2e631a3.zip | |
more bug updates from head
(This used to be commit 8b769bf5bbbe54b1a39fd85cc24db09c1ab7faab)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbind_nss.c | 8 |
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) * |