From: Ulrich Drepper Date: Thu, 17 Jun 1999 12:41:46 +0000 (+0000) Subject: Return -1 in case nscd is not available and value > 0 for error. X-Git-Tag: cvs/glibc_2-1-2~380 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd7f37f73871f554fe49fa9deb222478c4f3ad71;p=thirdparty%2Fglibc.git Return -1 in case nscd is not available and value > 0 for error. --- diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index cb5a8d6050a..5ca16308802 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; } } diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index 96d274b0656..cb8f62e6963 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -76,7 +76,7 @@ __nscd_gethostbyaddr_r (const char *addr, int len, int type, if (!((len == INADDRSZ && type == AF_INET) || (len == IN6ADDRSZ && type == AF_INET6))) /* LEN and TYPE do not match. */ - return 1; + return -1; reqtype = type == AF_INET6 ? GETHOSTBYADDRv6 : GETHOSTBYADDR; @@ -127,7 +127,7 @@ nscd_gethst_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; @@ -137,21 +137,21 @@ nscd_gethst_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, req.key_len); if (nbytes != req.key_len) { __close (sock); - return 1; + return -1; } nbytes = __read (sock, &hst_resp, sizeof (hst_response_header)); if (nbytes != sizeof (hst_response_header)) { __close (sock); - return 1; + return -1; } if (hst_resp.found == -1) @@ -159,7 +159,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, /* The daemon does not cache this database. */ __close (sock); __nss_not_use_nscd_hosts = 1; - return 1; + return -1; } if (hst_resp.found == 1) @@ -191,7 +191,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, no_room: __set_errno (ERANGE); __close (sock); - return -1; + return ERANGE; } cp += align1; @@ -270,7 +270,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, if (__readv (sock, vec, n) != total_len) { __close (sock); - return 1; + return -1; } /* Now we also can read the aliases. */ @@ -291,7 +291,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type, if (__read (sock, resultbuf->h_aliases[0], total_len) != total_len) { __close (sock); - return 1; + return -1; } __close (sock); @@ -305,6 +305,6 @@ nscd_gethst_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; } } diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c index e0600cb9de7..af361759f2e 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; } }