diff options
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/cache.c | 4 | ||||
| -rw-r--r-- | nscd/nscd.h | 4 | ||||
| -rw-r--r-- | nscd/nscd_getgr_r.c | 6 | ||||
| -rw-r--r-- | nscd/nscd_getpw_r.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/nscd/cache.c b/nscd/cache.c index 31a867adf5..d8339e915d 100644 --- a/nscd/cache.c +++ b/nscd/cache.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (c) 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -39,7 +39,7 @@ This function must be called with the read-lock held. */ struct hashentry * -cache_search (int type, void *key, size_t len, struct database *table, +cache_search (request_type type, void *key, size_t len, struct database *table, uid_t owner) { unsigned long int hash = __nis_hash (key, len) % table->module; diff --git a/nscd/nscd.h b/nscd/nscd.h index 11a30176df..f500b1598f 100644 --- a/nscd/nscd.h +++ b/nscd/nscd.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (c) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. @@ -118,7 +118,7 @@ extern void send_stats (int fd, struct database dbs[lastdb]); extern int receive_print_stats (void) __attribute__ ((__noreturn__)); /* cache.c */ -extern struct hashentry *cache_search (int type, void *key, size_t len, +extern struct hashentry *cache_search (request_type, void *key, size_t len, struct database *table, uid_t owner); extern void cache_add (int type, void *key, size_t len, const void *packet, size_t iovtotal, void *data, diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index 49f4b51304..2d09ed92f2 100644 --- a/nscd/nscd_getgr_r.c +++ b/nscd/nscd_getgr_r.c @@ -114,8 +114,8 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, vec[1].iov_base = (void *) key; vec[1].iov_len = keylen; - nbytes = (size_t) TEMP_FAILURE_RETRY (__writev (sock, vec, 2)); - if (nbytes != sizeof (request_header) + keylen) + nbytes = TEMP_FAILURE_RETRY (__writev (sock, vec, 2)); + if (nbytes != (ssize_t) (sizeof (request_header) + keylen)) { __close (sock); return -1; @@ -123,7 +123,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, nbytes = TEMP_FAILURE_RETRY (__read (sock, &gr_resp, sizeof (gr_response_header))); - if (nbytes != sizeof (gr_response_header)) + if (nbytes != (ssize_t) sizeof (gr_response_header)) { __close (sock); return -1; diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c index f4fa75fa6f..160e9ffa27 100644 --- a/nscd/nscd_getpw_r.c +++ b/nscd/nscd_getpw_r.c @@ -113,8 +113,8 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type, vec[1].iov_base = (void *) key; vec[1].iov_len = keylen; - nbytes = (size_t) TEMP_FAILURE_RETRY (__writev (sock, vec, 2)); - if (nbytes != sizeof (request_header) + keylen) + nbytes = TEMP_FAILURE_RETRY (__writev (sock, vec, 2)); + if (nbytes != (ssize_t) (sizeof (request_header) + keylen)) { __close (sock); return -1; @@ -122,7 +122,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type, nbytes = TEMP_FAILURE_RETRY (__read (sock, &pw_resp, sizeof (pw_response_header))); - if (nbytes != sizeof (pw_response_header)) + if (nbytes != (ssize_t) sizeof (pw_response_header)) { __close (sock); return -1; |