summaryrefslogtreecommitdiff
path: root/nscd/nscd_getpw_r.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-06-17 12:33:08 +0000
committerUlrich Drepper <drepper@redhat.com>1999-06-17 12:33:08 +0000
commit1670698f4a3802bcd26f94e24419f17fa1248861 (patch)
tree105e5f52b6348ecf52fe030fff9daeb9e05c3289 /nscd/nscd_getpw_r.c
parent39abffb33770682fabf4cb8068a5044fd846a23f (diff)
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_getpw_r.c')
-rw-r--r--nscd/nscd_getpw_r.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index e0600cb9de..af361759f2 100644
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -42,7 +42,7 @@ __nscd_getpwnam_r (const char *name, struct passwd *resultbuf, char *buffer,
size_t buflen)
{
if (name == NULL)
- return 1;
+ return -1;
return nscd_getpw_r (name, strlen (name) + 1, GETPWBYNAME, resultbuf,
buffer, buflen);
@@ -100,7 +100,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
if (sock == -1)
{
__nss_not_use_nscd_passwd = 1;
- return 1;
+ return -1;
}
req.version = NSCD_VERSION;
@@ -110,21 +110,21 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
if (nbytes != sizeof (request_header))
{
__close (sock);
- return 1;
+ return -1;
}
nbytes = __write (sock, key, keylen);
if (nbytes != keylen)
{
__close (sock);
- return 1;
+ return -1;
}
nbytes = __read (sock, &pw_resp, sizeof (pw_response_header));
if (nbytes != sizeof (pw_response_header))
{
__close (sock);
- return 1;
+ return -1;
}
if (pw_resp.found == -1)
@@ -132,7 +132,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
/* The daemon does not cache this database. */
__close (sock);
__nss_not_use_nscd_passwd = 1;
- return 1;
+ return -1;
}
if (pw_resp.found == 1)
@@ -146,7 +146,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
{
__set_errno (ERANGE);
__close (sock);
- return -1;
+ return ERANGE;
}
/* Set the information we already have. */
@@ -172,13 +172,13 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
__close (sock);
- return nbytes == total ? 0 : 1;
+ return nbytes == total ? 0 : -1;
}
else
{
__close (sock);
/* The `errno' to some value != ERANGE. */
__set_errno (ENOENT);
- return -1;
+ return ENOENT;
}
}