diff options
| author |   Ulrich Drepper <drepper@redhat.com> | 1999-06-17 12:33:08 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-06-17 12:33:08 +0000 |
| commit | 1670698f4a3802bcd26f94e24419f17fa1248861 (patch) | |
| tree | 105e5f52b6348ecf52fe030fff9daeb9e05c3289 /nscd/nscd_getgr_r.c | |
| parent | Update. (diff) | |
| download | glibc-1670698f4a3802bcd26f94e24419f17fa1248861.tar.gz glibc-1670698f4a3802bcd26f94e24419f17fa1248861.tar.bz2 glibc-1670698f4a3802bcd26f94e24419f17fa1248861.zip | |
Update.
* nss/getXXbyYY_r.c: Return error code not -1.
* nss/getXXent_r.c: Likewise.
* nss/getXXbyYY.c: Expect return alue to be ERANGE if buffer is too
small.
* nscd/nscd_getgr_r.c: Return -1 in case nscd is not available and
value > 0 for error.
* nscd/nscd_gethst_r.c: Likewise.
* nscd/nscd_getpw_r.c: Likewise.
1999-06-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/bits/ioctl-types.h: Add missing line
disciplines.
1999-06-14 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nscd/nscd_nischeck.c: Fix typos.
1999-06-17 Ulrich Drepper <drepper@cygnus.com>
Diffstat (limited to 'nscd/nscd_getgr_r.c')
| -rw-r--r-- | nscd/nscd_getgr_r.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index cb5a8d6050..5ca1630880 100644 --- a/nscd/nscd_getgr_r.c +++ b/nscd/nscd_getgr_r.c @@ -102,7 +102,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, if (sock == -1) { __nss_not_use_nscd_group = 1; - return 1; + return -1; } req.version = NSCD_VERSION; @@ -117,14 +117,14 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, if (__writev (sock, vec, 2) != sizeof (request_header) + keylen) { __close (sock); - return 1; + return -1; } nbytes = __read (sock, &gr_resp, sizeof (gr_response_header)); if (nbytes != sizeof (gr_response_header)) { __close (sock); - return 1; + return -1; } if (gr_resp.found == -1) @@ -132,7 +132,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, /* The daemon does not cache this database. */ __close (sock); __nss_not_use_nscd_group = 1; - return 1; + return -1; } if (gr_resp.found == 1) @@ -153,7 +153,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, no_room: __set_errno (ERANGE); __close (sock); - return -1; + return ERANGE; } p += align; @@ -186,7 +186,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, if (__readv (sock, vec, 2) != total_len) { __close (sock); - return 1; + return -1; } /* Clear the terminating entry. */ @@ -209,7 +209,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, __close (sock); /* The `errno' to some value != ERANGE. */ __set_errno (ENOENT); - return -1; + return ENOENT; } __close (sock); @@ -220,6 +220,6 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type, __close (sock); /* The `errno' to some value != ERANGE. */ __set_errno (ENOENT); - return -1; + return ENOENT; } } |