about summary refs log tree commit diff
path: root/nscd
diff options
context:
space:
mode:
Diffstat (limited to 'nscd')
-rw-r--r--nscd/nscd_getgr_r.c16
-rw-r--r--nscd/nscd_gethst_r.c20
-rw-r--r--nscd/nscd_getpw_r.c18
-rw-r--r--nscd/nscd_nischeck.c4
4 files changed, 29 insertions, 29 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;
     }
 }
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;
     }
 }
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;
     }
 }
diff --git a/nscd/nscd_nischeck.c b/nscd/nscd_nischeck.c
index aeb165ed4e..087386a6db 100644
--- a/nscd/nscd_nischeck.c
+++ b/nscd/nscd_nischeck.c
@@ -20,7 +20,7 @@
 /* nscd_nischeck: Check, if everybody has read permissions for NIS+ table.
    Return value:
     0: Everybody can read the NIS+ table
-    1: Only authenticated Users could read the NIS+ table */
+    1: Only authenticated users could read the NIS+ table */
 
 #include <argp.h>
 #include <error.h>
@@ -86,7 +86,7 @@ main (int argc, char **argv)
 static void
 print_version (FILE *stream, struct argp_state *state)
 {
-  fprintf (stream, "nscd_checknis (GNU %s) %s\n", PACKAGE, VERSION);
+  fprintf (stream, "nscd_nischeck (GNU %s) %s\n", PACKAGE, VERSION);
   fprintf (stream, gettext ("\
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\