[src/netbsd-3]: src/lib/libc/gen Pull up revision 1.68 (requested by lukem in...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3fab2096a8b7
branches:  netbsd-3
changeset: 576579:3fab2096a8b7
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jul 11 21:24:36 2005 +0000

description:
Pull up revision 1.68 (requested by lukem in ticket #540):
getpw{ent,nam,uid}_r():
Return 0 "entry not found" and errno for other failures.
("entry not found" still sets *result to NULL).
Various backends:
don't set the retval to errno (or modify errno) for NS_NOTFOUND.
Per discussion with Klaus Klein.

diffstat:

 lib/libc/gen/getpwent.c |  44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diffs (128 lines):

diff -r f5e94903621f -r 3fab2096a8b7 lib/libc/gen/getpwent.c
--- a/lib/libc/gen/getpwent.c   Mon Jul 11 21:24:19 2005 +0000
+++ b/lib/libc/gen/getpwent.c   Mon Jul 11 21:24:36 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getpwent.c,v 1.66.2.1 2005/07/11 21:22:27 tron Exp $   */
+/*     $NetBSD: getpwent.c,v 1.66.2.2 2005/07/11 21:24:36 tron Exp $   */
 
 /*-
  * Copyright (c) 1997-2000, 2004-2005 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
 #if 0
 static char sccsid[] = "@(#)getpwent.c 8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: getpwent.c,v 1.66.2.1 2005/07/11 21:22:27 tron Exp $");
+__RCSID("$NetBSD: getpwent.c,v 1.66.2.2 2005/07/11 21:24:36 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -248,7 +248,7 @@
        case 0:
                break;                  /* found */
        case 1:
-               return NS_NOTFOUND;
+               return NS_NOTFOUND;     /* not found */
        case -1:
                return NS_UNAVAIL;      /* error in db routines */
        default:
@@ -429,7 +429,8 @@
  *     If search is _PW_KEYBYNUM, look for state->keynum.
  *     If search is _PW_KEYBYNAME, look for name.
  *     If search is _PW_KEYBYUID, look for uid.
- *     Sets *retval to the errno if the result is not NS_SUCCESS.
+ *     Sets *retval to the errno if the result is not NS_SUCCESS
+ *     or NS_NOTFOUND.
  */
 static int
 _files_pwscan(int *retval, struct passwd *pw, char *buffer, size_t buflen,
@@ -508,7 +509,7 @@
        }
 
  filespwscan_out:
-       if (rv != NS_SUCCESS)
+       if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
                *retval = errno;
        return rv;
 }
@@ -797,7 +798,7 @@
                rv = NS_UNAVAIL;
 
  dnspwscan_out:
-       if (rv != NS_SUCCESS)
+       if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
                *retval = errno;
        if (hp)
                hesiod_free_list(state->context, hp);
@@ -1282,7 +1283,7 @@
                break;
        }
 
-       if (rv != NS_SUCCESS)
+       if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
                *retval = errno;
        if (data)
                free(data);
@@ -1892,7 +1893,8 @@
  *     If search is _PW_KEYBYNUM, look for state->keynum.
  *     If search is _PW_KEYBYNAME, look for name.
  *     If search is _PW_KEYBYUID, look for uid.
- *     Sets *retval to the errno if the result is not NS_SUCCESS.
+ *     Sets *retval to the errno if the result is not NS_SUCCESS
+ *     or NS_NOTFOUND.
  */
 static int
 _compat_pwscan(int *retval, struct passwd *pw, char *buffer, size_t buflen,
@@ -2124,7 +2126,7 @@
                        rv = NS_NOTFOUND;
        }
 
-       if (rv != NS_SUCCESS)
+       if (rv != NS_SUCCESS && rv != NS_NOTFOUND)
                *retval = errno;
        return rv;
 }
@@ -2380,7 +2382,13 @@
        r = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwent_r", __nsdefaultcompat,
            &retval, pwd, buffer, buflen, result);
        mutex_unlock(&_pwmutex);
-       return (r == NS_SUCCESS) ? 0 : retval ? retval : ENOENT;
+       switch (r) {
+       case NS_SUCCESS:
+       case NS_NOTFOUND:
+               return 0;
+       default:
+               return retval;
+       }
 }
 
 
@@ -2430,7 +2438,13 @@
        r = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwnam_r", __nsdefaultcompat,
            &retval, name, pwd, buffer, buflen, result);
        mutex_unlock(&_pwmutex);
-       return (r == NS_SUCCESS) ? 0 : retval ? retval : ENOENT;
+       switch (r) {
+       case NS_SUCCESS:
+       case NS_NOTFOUND:
+               return 0;
+       default:
+               return retval;
+       }
 }
 
 struct passwd *
@@ -2478,7 +2492,13 @@
        r = nsdispatch(NULL, dtab, NSDB_PASSWD, "getpwuid_r", __nsdefaultcompat,
            &retval, uid, pwd, buffer, buflen, result);
        mutex_unlock(&_pwmutex);
-       return (r == NS_SUCCESS) ? 0 : retval ? retval : ENOENT;
+       switch (r) {
+       case NS_SUCCESS:
+       case NS_NOTFOUND:
+               return 0;
+       default:
+               return retval;
+       }
 }
 
 void