adapt res_msend DNS query core for working with multiple sockets

[musl] / src / passwd / getspnam_r.c

diff --git a/src/passwd/getspnam_r.c b/src/passwd/getspnam_r.c
index 15f8c87..541e853 100644 (file)
--- a/src/passwd/getspnam_r.c
+++ b/src/passwd/getspnam_r.c
@@ -67,19 +67,21 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
        size_t k, l = strlen(name);
        int skip = 0;
        int cs;
+       int orig_errno = errno;
 
        *res = 0;
 
        /* Disallow potentially-malicious user names */
        if (*name=='.' || strchr(name, '/') || !l)
-               return EINVAL;
+               return errno = EINVAL;
 
        /* Buffer size must at least be able to hold name, plus some.. */
-       if (size < l+100) return ERANGE;
+       if (size < l+100)
+               return errno = ERANGE;
 
        /* Protect against truncation */
        if (snprintf(path, sizeof path, "/etc/tcb/%s/shadow", name) >= sizeof path)
-               return EINVAL;
+               return errno = EINVAL;
 
        fd = open(path, O_RDONLY|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC);
        if (fd >= 0) {
@@ -92,13 +94,19 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
                        return errno;
                }
        } else {
+               if (errno != ENOENT && errno != ENOTDIR)
+                       return errno;
                f = fopen("/etc/shadow", "rbe");
-               if (!f) return errno;
+               if (!f) {
+                       if (errno != ENOENT && errno != ENOTDIR)
+                               return errno;
+                       return 0;
+               }
        }
 
        pthread_cleanup_push(cleanup, f);
        while (fgets(buf, size, f) && (k=strlen(buf))>0) {
-               if (skip || strncmp(name, buf, l)) {
+               if (skip || strncmp(name, buf, l) || buf[l]!=':') {
                        skip = buf[k-1] != '\n';
                        continue;
                }
@@ -112,5 +120,6 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
                break;
        }
        pthread_cleanup_pop(1);
+       errno = rv ? rv : orig_errno;
        return rv;
 }