summary refs log tree commit diff
path: root/nscd/nscd_gethst_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_gethst_r.c
parent39abffb33770682fabf4cb8068a5044fd846a23f (diff)
downloadglibc-1670698f4a3802bcd26f94e24419f17fa1248861.tar.gz
glibc-1670698f4a3802bcd26f94e24419f17fa1248861.tar.xz
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_gethst_r.c')
-rw-r--r--nscd/nscd_gethst_r.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
index 96d274b065..cb8f62e696 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;
     }
 }