From 34816665b678a06e096a378303b68d35ff10a693 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 26 Aug 2002 07:06:57 +0000 Subject: Update. * nss/getXXbyYY_r.c (REENTRANT_NAME): Return ENOENT if status is neither SUCCESS nor TRYAGAIN [PR libc/4259]. * nss/nss_files/files-XXX.c (internal_getent): Don't set *errnop to ENOENT if no entry is found. * nis/nss_compat/compat-grp.c: Don't set errno in case of lookup failure. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-initgroups.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * resolv/nss_dns/dns-host.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Save errno around NIS calls. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * hesiod/nss_hesiod/hesiod-pwd.c (lookup): Preserve errno value. * hesiod/nss_hesiod/hesiod-proto.c (lookup): Likewise. * hesiod/nss_hesiod/hesiod-grp.c (lookup): Likewise. * hesiod/nss_hesiod/hesiod-service.c (lookup): Likewise. --- nis/nss_compat/compat-grp.c | 55 ++++++----------------- nis/nss_compat/compat-initgroups.c | 21 +++------ nis/nss_compat/compat-pwd.c | 89 +++++++++----------------------------- nis/nss_compat/compat-spwd.c | 54 +++++++---------------- 4 files changed, 53 insertions(+), 166 deletions(-) (limited to 'nis/nss_compat') diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index cd939eb9e1..c9750ae1be 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -246,7 +246,6 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, if (yp_get_default_domain (&domain) != YPERR_SUCCESS) { ent->nis = 0; - *errnop = ENOENT; return NSS_STATUS_NOTFOUND; } @@ -286,7 +285,6 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, != YPERR_SUCCESS) { ent->nis = 0; - *errnop = ENOENT; return NSS_STATUS_NOTFOUND; } @@ -438,17 +436,11 @@ getgrnam_plusgroup (const char *name, struct group *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (yp_match (domain, "group.byname", name, strlen (name), &outval, &outvallen) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (buflen < ((size_t) outvallen + 1)) { @@ -493,10 +485,8 @@ getgrent_next_file (struct group *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); @@ -636,10 +626,8 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; return NSS_STATUS_NOTFOUND; - } + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); @@ -681,10 +669,7 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, if (result->gr_name[0] == '-' && result->gr_name[1] != '\0') { if (strcmp (&result->gr_name[1], name) == 0) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else continue; } @@ -730,10 +715,7 @@ _nss_compat_getgrnam_r (const char *name, struct group *grp, enum nss_status status; if (name[0] == '-' || name[0] == '+') - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; __libc_lock_lock (lock); @@ -789,19 +771,13 @@ getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; snprintf (buf, sizeof (buf), "%lu", (unsigned long int) gid); if (yp_match (domain, "group.bygid", buf, strlen (buf), &outval, &outvallen) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (buflen < ((size_t) outvallen + 1)) { @@ -848,10 +824,8 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); @@ -918,10 +892,7 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, status = getgrgid_plusgroup (gid, result, buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else return status; } diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c index 9f141fa3e3..824612286a 100644 --- a/nis/nss_compat/compat-initgroups.c +++ b/nis/nss_compat/compat-initgroups.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1998. @@ -270,7 +270,6 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, if (yp_get_default_domain (&domain) != YPERR_SUCCESS) { ent->nis = 0; - *errnop = ENOENT; return NSS_STATUS_NOTFOUND; } @@ -287,7 +286,6 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, if (ent->start == NULL || status != NSS_STATUS_SUCCESS) { ent->nis = 0; - *errnop = ENOENT; return NSS_STATUS_UNAVAIL; } } @@ -297,7 +295,6 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, { if (ent->next == NULL) { - *errnop = ENOENT; ent->nis = 0; return NSS_STATUS_NOTFOUND; } @@ -425,17 +422,11 @@ getgrnam_plusgroup (const char *name, struct group *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (yp_match (domain, "group.byname", name, strlen (name), &outval, &outvallen) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (buflen < ((size_t) outvallen + 1)) { @@ -483,10 +474,8 @@ getgrent_next_file (struct group *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 2a55df2908..5c9a551d88 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -223,7 +223,6 @@ insert_passwd_adjunct (char **result, int *len, char *domain, int *errnop) if ((res = malloc (namelen + restlen + (endp - encrypted) + 2)) == NULL) { free (result2); - *errnop = ENOMEM; return NSS_STATUS_TRYAGAIN; } @@ -753,7 +752,6 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, { ent->nis = 0; give_pwd_free (&ent->pwd); - *errnop = ENOENT; return NSS_STATUS_NOTFOUND; } @@ -862,10 +860,7 @@ getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent, } if (in_blacklist (result->pw_name, strlen (result->pw_name), ent)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; } else /* Use NIS */ { @@ -873,17 +868,11 @@ getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (yp_match (domain, "passwd.byname", name, strlen (name), &outval, &outvallen) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop) != NSS_STATUS_SUCCESS) @@ -910,10 +899,7 @@ getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent, return NSS_STATUS_TRYAGAIN; if (in_blacklist (result->pw_name, strlen (result->pw_name), ent)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; } if (parse_res > 0) @@ -949,10 +935,8 @@ getpwent_next_file (struct passwd *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); @@ -1027,11 +1011,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent, if (status == NSS_STATUS_RETURN) continue; else - { - if (status == NSS_STATUS_NOTFOUND) - *errnop = ENOENT; - return status; - } + return status; } /* -user */ @@ -1171,7 +1151,6 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) { - *errnop = ENOENT; return NSS_STATUS_NOTFOUND; } if (p == NULL || buffer[buflen - 1] != '\xff') @@ -1244,10 +1223,7 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, && result->pw_name[1] != '@') { if (strcmp (&result->pw_name[1], name) == 0) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else continue; } @@ -1298,10 +1274,7 @@ _nss_compat_getpwnam_r (const char *name, struct passwd *pwd, enum nss_status status; if (name[0] == '-' || name[0] == '+') - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; __libc_lock_lock (lock); @@ -1379,19 +1352,13 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; sprintf (buf, "%lu", (unsigned long int) uid); if (yp_match (domain, "passwd.byuid", buf, strlen (buf), &outval, &outvallen) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop) != NSS_STATUS_SUCCESS) @@ -1452,10 +1419,8 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); @@ -1505,10 +1470,8 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, status = getpwuid_plususer (uid, result, buffer, buflen, errnop); if (status == NSS_STATUS_SUCCESS && innetgr (buf, NULL, result->pw_name, NULL)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + continue; } @@ -1533,10 +1496,7 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, } else if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else return status; @@ -1555,10 +1515,7 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, status = getpwuid_plususer (uid, result, buffer, buflen, errnop); if (status == NSS_STATUS_SUCCESS && innetgr (buf, NULL, result->pw_name, NULL)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; continue; } @@ -1583,10 +1540,7 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, } else if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else return status; @@ -1603,10 +1557,7 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, break; else if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else return status; } diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index bb9dd85bf9..8ce02e3da3 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -636,7 +636,6 @@ getspent_next_nis (struct spwd *result, ent_t *ent, { ent->nis = 0; give_spwd_free (&ent->pwd); - *errnop = ENOENT; return NSS_STATUS_NOTFOUND; } @@ -746,16 +745,12 @@ getspnam_plususer (const char *name, struct spwd *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (yp_match (domain, "shadow.byname", name, strlen (name), &outval, &outvallen) != YPERR_SUCCESS) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (buflen < ((size_t) outvallen + 1)) { free (outval); @@ -805,10 +800,8 @@ getspent_next_file (struct spwd *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); @@ -1016,10 +1009,8 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, buffer[buflen - 1] = '\xff'; p = fgets (buffer, buflen, ent->stream); if (p == NULL && feof (ent->stream)) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; + if (p == NULL || buffer[buflen - 1] != '\xff') { fsetpos (ent->stream, &pos); @@ -1070,10 +1061,7 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, { if (user != NULL && user[0] != '-') if (strcmp (user, name) == 0) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; } __internal_endnetgrent (&netgrdata); continue; @@ -1113,10 +1101,7 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, && result->sp_namp[1] != '@') { if (strcmp (&result->sp_namp[1], name) == 0) - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else continue; } @@ -1132,11 +1117,8 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, status = getspnam_plususer (name, result, buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) - { - /* We couldn't parse the entry */ - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + /* We couldn't parse the entry */ + return NSS_STATUS_NOTFOUND; else return status; } @@ -1149,10 +1131,7 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, status = getspnam_plususer (name, result, buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; else return status; } @@ -1169,10 +1148,7 @@ _nss_compat_getspnam_r (const char *name, struct spwd *pwd, enum nss_status status; if (name[0] == '-' || name[0] == '+') - { - *errnop = ENOENT; - return NSS_STATUS_NOTFOUND; - } + return NSS_STATUS_NOTFOUND; if (ni == NULL) { -- cgit 1.4.1