diff options
Diffstat (limited to 'nis/nss_compat')
| -rw-r--r-- | nis/nss_compat/compat-grp.c | 155 | ||||
| -rw-r--r-- | nis/nss_compat/compat-pwd.c | 236 | ||||
| -rw-r--r-- | nis/nss_compat/compat-spwd.c | 161 |
3 files changed, 325 insertions, 227 deletions
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index 6d4ca25e5d..a586d1fbbf 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -225,7 +225,7 @@ _nss_compat_endgrent (void) static enum nss_status getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; char *domain; @@ -286,13 +286,14 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, while (isspace (*p)) ++p; - if ((parse_res = _nss_files_parse_grent (p, result, data, buflen)) == -1) + parse_res = _nss_files_parse_grent (p, result, data, buflen, errnop); + if (parse_res == -1) { free (ent->oldkey); ent->oldkey = save_oldkey; ent->oldkeylen = save_oldlen; ent->nis_first = save_nis_first; - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } else @@ -312,7 +313,7 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, static enum nss_status getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { int parse_res; @@ -347,13 +348,14 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer, return niserr2nss (ent->result->status); } } - if ((parse_res = _nss_nisplus_parse_grent (ent->result, 0, result, - buffer, buflen)) == -1) + parse_res = _nss_nisplus_parse_grent (ent->result, 0, result, + buffer, buflen, errnop); + if (parse_res == -1) { nis_freeresult (ent->result); ent->result = save_oldres; ent->nis_first = save_nis_first; - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } else @@ -374,7 +376,7 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer, /* This function handle the +group entrys in /etc/group */ static enum nss_status getgrnam_plusgroup (const char *name, struct group *result, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; int parse_res; @@ -393,11 +395,12 @@ getgrnam_plusgroup (const char *name, struct group *result, char *buffer, nis_freeresult (res); return status; } - if ((parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer, - buflen)) == -1) + parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer, buflen, + errnop); + if (parse_res == -1) { - __set_errno (ERANGE); nis_freeresult (res); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } nis_freeresult (res); @@ -408,21 +411,25 @@ getgrnam_plusgroup (const char *name, struct group *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } if (yp_match (domain, "group.byname", name, strlen (name), &outval, &outvallen) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } p = strncpy (buffer, outval, buflen < (size_t) outvallen ? buflen : (size_t) outvallen); free (outval); while (isspace (*p)) p++; - if ((parse_res = _nss_files_parse_grent (p, result, data, buflen)) == -1) - { - __set_errno (ERANGE); - return NSS_STATUS_TRYAGAIN; - } + parse_res = _nss_files_parse_grent (p, result, data, buflen, errnop); + if (parse_res == -1) + return NSS_STATUS_TRYAGAIN; } if (parse_res) @@ -434,7 +441,7 @@ getgrnam_plusgroup (const char *name, struct group *result, char *buffer, static enum nss_status getgrent_next_file (struct group *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; while (1) @@ -453,7 +460,8 @@ getgrent_next_file (struct group *result, ent_t *ent, return NSS_STATUS_NOTFOUND; else { - __set_errno (ERANGE); + fsetpos (ent->stream, &pos); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } } @@ -468,13 +476,14 @@ getgrent_next_file (struct group *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !(parse_res = _nss_files_parse_grent (p, result, data, buflen))); + !(parse_res = _nss_files_parse_grent (p, result, data, buflen, + errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -500,14 +509,22 @@ getgrent_next_file (struct group *result, ent_t *ent, /etc/group */ blacklist_store_name (&result->gr_name[1], ent); status = getgrnam_plusgroup (&result->gr_name[1], result, buffer, - buflen); + buflen, errnop); if (status == NSS_STATUS_SUCCESS) /* We found the entry. */ break; else if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ continue; else - return status; + { + if (status == NSS_STATUS_TRYAGAIN) + { + /* The parser ran out of space. */ + fsetpos (ent->stream, &pos); + *errnop = ERANGE; + } + return status; + } } /* +:... */ @@ -517,9 +534,9 @@ getgrent_next_file (struct group *result, ent_t *ent, ent->nis_first = TRUE; if (use_nisplus) - return getgrent_next_nisplus (result, ent, buffer, buflen); + return getgrent_next_nisplus (result, ent, buffer, buflen, errnop); else - return getgrent_next_nis (result, ent, buffer, buflen); + return getgrent_next_nis (result, ent, buffer, buflen, errnop); } } @@ -529,21 +546,22 @@ getgrent_next_file (struct group *result, ent_t *ent, static enum nss_status internal_getgrent_r (struct group *gr, ent_t *ent, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { if (ent->nis) { if (use_nisplus) - return getgrent_next_nisplus (gr, ent, buffer, buflen); + return getgrent_next_nisplus (gr, ent, buffer, buflen, errnop); else - return getgrent_next_nis (gr, ent, buffer, buflen); + return getgrent_next_nis (gr, ent, buffer, buflen, errnop); } else - return getgrent_next_file (gr, ent, buffer, buflen); + return getgrent_next_file (gr, ent, buffer, buflen, errnop); } enum nss_status -_nss_compat_getgrent_r (struct group *grp, char *buffer, size_t buflen) +_nss_compat_getgrent_r (struct group *grp, char *buffer, size_t buflen, + int *errnop) { enum nss_status status = NSS_STATUS_SUCCESS; @@ -554,7 +572,7 @@ _nss_compat_getgrent_r (struct group *grp, char *buffer, size_t buflen) status = internal_setgrent (&ext_ent); if (status == NSS_STATUS_SUCCESS) - status = internal_getgrent_r (grp, &ext_ent, buffer, buflen); + status = internal_getgrent_r (grp, &ext_ent, buffer, buflen, errnop); __libc_lock_unlock (lock); @@ -564,7 +582,7 @@ _nss_compat_getgrent_r (struct group *grp, char *buffer, size_t buflen) /* Searches in /etc/group and the NIS/NIS+ map for a special group */ static enum nss_status internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; while (1) @@ -583,7 +601,8 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, return NSS_STATUS_NOTFOUND; else { - __set_errno (ERANGE); + fsetpos (ent->stream, &pos); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } } @@ -598,13 +617,14 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !(parse_res = _nss_files_parse_grent (p, result, data, buflen))); + !(parse_res = _nss_files_parse_grent (p, result, data, buflen, + errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -618,8 +638,7 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, } /* -group */ - if (result->gr_name[0] == '-' && result->gr_name[1] != '\0' - && result->gr_name[1] != '@') + if (result->gr_name[0] == '-' && result->gr_name[1] != '\0') { if (strcmp (&result->gr_name[1], name) == 0) return NSS_STATUS_NOTFOUND; @@ -628,14 +647,14 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, } /* +group */ - if (result->gr_name[0] == '+' && result->gr_name[1] != '\0' - && result->gr_name[1] != '@') + if (result->gr_name[0] == '+' && result->gr_name[1] != '\0') { if (strcmp (name, &result->gr_name[1]) == 0) { enum nss_status status; - status = getgrnam_plusgroup (name, result, buffer, buflen); + status = getgrnam_plusgroup (name, result, buffer, buflen, + errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ continue; @@ -648,7 +667,7 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, { enum nss_status status; - status = getgrnam_plusgroup (name, result, buffer, buflen); + status = getgrnam_plusgroup (name, result, buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ continue; @@ -662,7 +681,7 @@ internal_getgrnam_r (const char *name, struct group *result, ent_t *ent, enum nss_status _nss_compat_getgrnam_r (const char *name, struct group *grp, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}}; enum nss_status status; @@ -679,7 +698,7 @@ _nss_compat_getgrnam_r (const char *name, struct group *grp, if (status != NSS_STATUS_SUCCESS) return status; - status = internal_getgrnam_r (name, grp, &ent, buffer, buflen); + status = internal_getgrnam_r (name, grp, &ent, buffer, buflen, errnop); internal_endgrent (&ent); @@ -689,7 +708,7 @@ _nss_compat_getgrnam_r (const char *name, struct group *grp, /* This function handle the + entry in /etc/group */ static enum nss_status getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; int parse_res; @@ -709,10 +728,10 @@ getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, return status; } if ((parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer, - buflen)) == -1) + buflen, errnop)) == -1) { - __set_errno (ERANGE); nis_freeresult (res); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } nis_freeresult (res); @@ -724,23 +743,27 @@ getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } snprintf (buf, sizeof (buf), "%d", gid); if (yp_match (domain, "group.bygid", buf, strlen (buf), &outval, &outvallen) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } p = strncpy (buffer, outval, buflen < (size_t) outvallen ? buflen : (size_t) outvallen); free (outval); while (isspace (*p)) p++; - if ((parse_res = _nss_files_parse_grent (p, result, data, buflen)) == -1) - { - __set_errno (ERANGE); - return NSS_STATUS_TRYAGAIN; - } + parse_res = _nss_files_parse_grent (p, result, data, buflen, errnop); + if (parse_res == -1) + return NSS_STATUS_TRYAGAIN; } if (parse_res) @@ -753,7 +776,7 @@ getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, /* Searches in /etc/group and the NIS/NIS+ map for a special group id */ static enum nss_status internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; while (1) @@ -772,7 +795,8 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, return NSS_STATUS_NOTFOUND; else { - __set_errno (ERANGE); + fsetpos (ent->stream, &pos); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } } @@ -787,13 +811,14 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !(parse_res = _nss_files_parse_grent (p, result, data, buflen))); + !(parse_res = _nss_files_parse_grent (p, result, data, buflen, + errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -807,16 +832,14 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, } /* -group */ - if (result->gr_name[0] == '-' && result->gr_name[1] != '\0' - && result->gr_name[1] != '@') + if (result->gr_name[0] == '-' && result->gr_name[1] != '\0') { blacklist_store_name (&result->gr_name[1], ent); continue; } /* +group */ - if (result->gr_name[0] == '+' && result->gr_name[1] != '\0' - && result->gr_name[1] != '@') + if (result->gr_name[0] == '+' && result->gr_name[1] != '\0') { enum nss_status status; @@ -824,7 +847,7 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, /etc/group */ blacklist_store_name (&result->gr_name[1], ent); status = getgrnam_plusgroup (&result->gr_name[1], result, buffer, - buflen); + buflen, errnop); if (status == NSS_STATUS_SUCCESS && result->gr_gid == gid) break; else @@ -835,7 +858,7 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, { enum nss_status status; - status = getgrgid_plusgroup (gid, result, buffer, buflen); + status = getgrgid_plusgroup (gid, result, buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ return NSS_STATUS_NOTFOUND; else @@ -848,7 +871,7 @@ internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent, enum nss_status _nss_compat_getgrgid_r (gid_t gid, struct group *grp, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}}; enum nss_status status; @@ -862,7 +885,7 @@ _nss_compat_getgrgid_r (gid_t gid, struct group *grp, if (status != NSS_STATUS_SUCCESS) return status; - status = internal_getgrgid_r (gid, grp, &ent, buffer, buflen); + status = internal_getgrgid_r (gid, grp, &ent, buffer, buflen, errnop); internal_endgrent (&ent); diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 38a7e2f205..c8e6f9cc8d 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -338,7 +338,7 @@ _nss_compat_endpwent (void) static enum nss_status getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent, - char *group, char *buffer, size_t buflen) + char *group, char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; char *ypdomain, *host, *user, *domain, *outval, *p, *p2; @@ -367,7 +367,8 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent, saved_cursor = ent->netgrdata.cursor; status = __internal_getnetgrent_r (&host, &user, &domain, - &ent->netgrdata, buffer, buflen); + &ent->netgrdata, buffer, buflen, + errnop); if (status != 1) { __internal_endnetgrent (&ent->netgrdata); @@ -395,7 +396,7 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent, p2len = pwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); @@ -404,7 +405,8 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent, while (isspace (*p)) p++; free (outval); - if ((parse_res = _nss_files_parse_pwent (p, result, data, buflen)) == -1) + parse_res = _nss_files_parse_pwent (p, result, data, buflen, errnop); + if (parse_res == -1) { ent->netgrdata.cursor = saved_cursor; return NSS_STATUS_TRYAGAIN; @@ -426,7 +428,7 @@ getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent, static enum nss_status getpwent_next_nisplus_netgr (const char *name, struct passwd *result, ent_t *ent, char *group, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { char *ypdomain, *host, *user, *domain, *p2; int status, parse_res; @@ -456,7 +458,8 @@ getpwent_next_nisplus_netgr (const char *name, struct passwd *result, saved_cursor = ent->netgrdata.cursor; status = __internal_getnetgrent_r (&host, &user, &domain, - &ent->netgrdata, buffer, buflen); + &ent->netgrdata, buffer, buflen, + errnop); if (status != 1) { __internal_endnetgrent (&ent->netgrdata); @@ -479,7 +482,7 @@ getpwent_next_nisplus_netgr (const char *name, struct passwd *result, p2len = pwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); @@ -494,11 +497,13 @@ getpwent_next_nisplus_netgr (const char *name, struct passwd *result, nis_freeresult (nisres); continue; } - if ((parse_res = _nss_nisplus_parse_pwent (nisres, result, buffer, - buflen)) == -1) + parse_res = _nss_nisplus_parse_pwent (nisres, result, buffer, + buflen, errnop); + if (parse_res == -1) { nis_freeresult (nisres); ent->netgrdata.cursor = saved_cursor; + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } nis_freeresult (nisres); @@ -518,7 +523,7 @@ getpwent_next_nisplus_netgr (const char *name, struct passwd *result, static enum nss_status getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { int parse_res; size_t p2len; @@ -527,7 +532,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, p2len = pwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); @@ -542,7 +547,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, saved_first = TRUE; saved_res = ent->result; - ent->result = nis_first_entry(pwdtable); + ent->result = nis_first_entry (pwdtable); if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS) { ent->nis = 0; @@ -555,7 +560,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, { nis_result *res; - res = nis_next_entry(pwdtable, &ent->result->cookie); + res = nis_next_entry (pwdtable, &ent->result->cookie); saved_res = ent->result; saved_first = FALSE; ent->result = res; @@ -567,13 +572,14 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, return niserr2nss (ent->result->status); } } - if ((parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer, - buflen)) == -1) + parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer, + buflen, errnop); + if (parse_res == -1) { nis_freeresult (ent->result); ent->result = saved_res; ent->first = saved_first; - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } else @@ -595,7 +601,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, static enum nss_status getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; char *domain, *outkey, *outval, *p, *p2; @@ -612,7 +618,7 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, p2len = pwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); @@ -666,13 +672,14 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, while (isspace (*p)) ++p; - if ((parse_res = _nss_files_parse_pwent (p, result, data, buflen)) == -1) + parse_res = _nss_files_parse_pwent (p, result, data, buflen, errnop); + if (parse_res == -1) { free (ent->oldkey); ent->oldkey = saved_oldkey; ent->oldkeylen = saved_oldlen; ent->first = saved_first; - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } else @@ -680,8 +687,8 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, if (!saved_first) free (saved_oldkey); } - if (parse_res && - in_blacklist (result->pw_name, strlen (result->pw_name), ent)) + if (parse_res + && in_blacklist (result->pw_name, strlen (result->pw_name), ent)) parse_res = 0; } while (!parse_res); @@ -694,7 +701,7 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, /* This function handle the +user entrys in /etc/passwd */ static enum nss_status getpwnam_plususer (const char *name, struct passwd *result, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; struct passwd pwd; @@ -709,7 +716,7 @@ getpwnam_plususer (const char *name, struct passwd *result, char *buffer, plen = pwd_need_buflen (&pwd); if (plen > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p = buffer + (buflen - plen); @@ -729,11 +736,12 @@ getpwnam_plususer (const char *name, struct passwd *result, char *buffer, nis_freeresult (res); return status; } - if ((parse_res = _nss_nisplus_parse_pwent (res, result, buffer, - buflen)) == -1) + parse_res = _nss_nisplus_parse_pwent (res, result, buffer, + buflen, errnop); + if (parse_res == -1) { nis_freeresult (res); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } nis_freeresult (res); @@ -744,24 +752,27 @@ getpwnam_plususer (const char *name, struct passwd *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } if (yp_match (domain, "passwd.byname", name, strlen (name), &outval, &outvallen) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } ptr = strncpy (buffer, outval, buflen < (size_t) outvallen ? buflen : (size_t) outvallen); buffer[buflen < (size_t) outvallen ? buflen : (size_t) outvallen] = '\0'; free (outval); while (isspace (*ptr)) ptr++; - if ((parse_res = _nss_files_parse_pwent (ptr, result, data, buflen)) - == -1) - { - __set_errno (ERANGE); - return NSS_STATUS_TRYAGAIN; - } + parse_res = _nss_files_parse_pwent (ptr, result, data, buflen, errnop); + if (parse_res == -1) + return NSS_STATUS_TRYAGAIN; } if (parse_res > 0) @@ -782,7 +793,7 @@ getpwnam_plususer (const char *name, struct passwd *result, char *buffer, static enum nss_status getpwent_next_file (struct passwd *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; while (1) @@ -796,7 +807,16 @@ getpwent_next_file (struct passwd *result, ent_t *ent, fgetpos (ent->stream, &pos); p = fgets (buffer, buflen, ent->stream); if (p == NULL) - return NSS_STATUS_NOTFOUND; + { + if (feof (ent->stream)) + return NSS_STATUS_NOTFOUND; + else + { + fsetpos (ent->stream, &pos); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + } /* Terminate the line for any case. */ buffer[buflen - 1] = '\0'; @@ -808,13 +828,14 @@ getpwent_next_file (struct passwd *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !(parse_res = _nss_files_parse_pwent (p, result, data, buflen))); + !(parse_res = _nss_files_parse_pwent (p, result, data, buflen, + errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -826,14 +847,15 @@ getpwent_next_file (struct passwd *result, ent_t *ent, if (result->pw_name[0] == '-' && result->pw_name[1] == '@' && result->pw_name[2] != '\0') { + /* XXX Do not use fixed length buffer. */ char buf2[1024]; char *user, *host, *domain; struct __netgrent netgrdata; bzero (&netgrdata, sizeof (struct __netgrent)); __internal_setnetgrent (&result->pw_name[2], &netgrdata); - while (__internal_getnetgrent_r (&host, &user, &domain, - &netgrdata, buf2, sizeof (buf2))) + while (__internal_getnetgrent_r (&host, &user, &domain, &netgrdata, + buf2, sizeof (buf2), errnop)) { if (user != NULL && user[0] != '-') blacklist_store_name (user, ent); @@ -855,11 +877,11 @@ getpwent_next_file (struct passwd *result, ent_t *ent, if (use_nisplus) status = getpwent_next_nisplus_netgr (NULL, result, ent, &result->pw_name[2], - buffer, buflen); + buffer, buflen, errnop); else status = getpwent_next_nis_netgr (NULL, result, ent, &result->pw_name[2], - buffer, buflen); + buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) continue; else @@ -884,14 +906,22 @@ getpwent_next_file (struct passwd *result, ent_t *ent, /etc/passwd */ blacklist_store_name (&result->pw_name[1], ent); status = getpwnam_plususer (&result->pw_name[1], result, buffer, - buflen); + buflen, errnop); if (status == NSS_STATUS_SUCCESS) /* We found the entry. */ break; else if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ continue; else - return status; + { + if (status == NSS_STATUS_TRYAGAIN) + { + /* The parser ran out of space */ + fsetpos (ent->stream, &pos); + *errnop = ERANGE; + } + return status; + } } /* +:... */ @@ -902,9 +932,9 @@ getpwent_next_file (struct passwd *result, ent_t *ent, copy_pwd_changes (&ent->pwd, result, NULL, 0); if (use_nisplus) - return getpwent_next_nisplus (result, ent, buffer, buflen); + return getpwent_next_nisplus (result, ent, buffer, buflen, errnop); else - return getpwent_next_nis (result, ent, buffer, buflen); + return getpwent_next_nis (result, ent, buffer, buflen, errnop); } } @@ -914,7 +944,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent, static enum nss_status internal_getpwent_r (struct passwd *pw, ent_t *ent, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { if (ent->netgroup) { @@ -924,11 +954,12 @@ internal_getpwent_r (struct passwd *pw, ent_t *ent, char *buffer, /* Since this is not the first call, we don't need the group name */ if (use_nisplus) status = getpwent_next_nisplus_netgr (NULL, pw, ent, NULL, buffer, - buflen); + buflen, errnop); else - status = getpwent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen); + status = getpwent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen, + errnop); if (status == NSS_STATUS_RETURN) - return getpwent_next_file (pw, ent, buffer, buflen); + return getpwent_next_file (pw, ent, buffer, buflen, errnop); else return status; } @@ -936,16 +967,17 @@ internal_getpwent_r (struct passwd *pw, ent_t *ent, char *buffer, if (ent->nis) { if (use_nisplus) - return getpwent_next_nisplus (pw, ent, buffer, buflen); + return getpwent_next_nisplus (pw, ent, buffer, buflen, errnop); else - return getpwent_next_nis (pw, ent, buffer, buflen); + return getpwent_next_nis (pw, ent, buffer, buflen, errnop); } else - return getpwent_next_file (pw, ent, buffer, buflen); + return getpwent_next_file (pw, ent, buffer, buflen, errnop); } enum nss_status -_nss_compat_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen) +_nss_compat_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen, + int *errnop) { enum nss_status status = NSS_STATUS_SUCCESS; @@ -962,7 +994,7 @@ _nss_compat_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen) status = internal_setpwent (&ext_ent); if (status == NSS_STATUS_SUCCESS) - status = internal_getpwent_r (pwd, &ext_ent, buffer, buflen); + status = internal_getpwent_r (pwd, &ext_ent, buffer, buflen, errnop); __libc_lock_unlock (lock); @@ -972,7 +1004,7 @@ _nss_compat_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen) /* Searches in /etc/passwd and the NIS/NIS+ map for a special user */ static enum nss_status internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; @@ -992,7 +1024,8 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, return NSS_STATUS_NOTFOUND; else { - __set_errno (ERANGE); + fsetpos (ent->stream, &pos); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } } @@ -1007,13 +1040,14 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !(parse_res = _nss_files_parse_pwent (p, result, data, buflen))); + !(parse_res = _nss_files_parse_pwent (p, result, data, buflen, + errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -1030,14 +1064,15 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, if (result->pw_name[0] == '-' && result->pw_name[1] == '@' && result->pw_name[2] != '\0') { + /* XXX Do not use fixed length buffers. */ char buf2[1024]; char *user, *host, *domain; struct __netgrent netgrdata; bzero (&netgrdata, sizeof (struct __netgrent)); __internal_setnetgrent (&result->pw_name[2], &netgrdata); - while (__internal_getnetgrent_r (&host, &user, &domain, - &netgrdata, buf2, sizeof (buf2))) + while (__internal_getnetgrent_r (&host, &user, &domain, &netgrdata, + buf2, sizeof (buf2), errnop)) { if (user != NULL && user[0] != '-') if (strcmp (user, name) == 0) @@ -1063,10 +1098,10 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, { if (use_nisplus) status = getpwent_next_nisplus_netgr (name, result, ent, buf, - buffer, buflen); + buffer, buflen, errnop); else status = getpwent_next_nis_netgr (name, result, ent, buf, - buffer, buflen); + buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) continue; @@ -1095,7 +1130,8 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, { enum nss_status status; - status = getpwnam_plususer (name, result, buffer, buflen); + status = getpwnam_plususer (name, result, buffer, buflen, + errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ return NSS_STATUS_NOTFOUND; @@ -1109,7 +1145,7 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, { enum nss_status status; - status = getpwnam_plususer (name, result, buffer, buflen); + status = getpwnam_plususer (name, result, buffer, buflen, errnop); if (status == NSS_STATUS_SUCCESS) /* We found the entry. */ break; else @@ -1124,7 +1160,7 @@ internal_getpwnam_r (const char *name, struct passwd *result, ent_t *ent, enum nss_status _nss_compat_getpwnam_r (const char *name, struct passwd *pwd, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}, {NULL, NULL, 0, 0, NULL, NULL, NULL}}; @@ -1147,7 +1183,7 @@ _nss_compat_getpwnam_r (const char *name, struct passwd *pwd, if (status != NSS_STATUS_SUCCESS) return status; - status = internal_getpwnam_r (name, pwd, &ent, buffer, buflen); + status = internal_getpwnam_r (name, pwd, &ent, buffer, buflen, errnop); internal_endpwent (&ent); @@ -1157,7 +1193,7 @@ _nss_compat_getpwnam_r (const char *name, struct passwd *pwd, /* This function handle the + entry in /etc/passwd for getpwuid */ static enum nss_status getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; struct passwd pwd; @@ -1172,7 +1208,7 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, plen = pwd_need_buflen (&pwd); if (plen > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p = buffer + (buflen - plen); @@ -1183,7 +1219,7 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, nis_result *res; char buf[1024 + pwdtablelen]; - sprintf(buf, "[uid=%d],%s", uid, pwdtable); + snprintf(buf, sizeof (buf), "[uid=%d],%s", uid, pwdtable); res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL); if (niserr2nss (res->status) != NSS_STATUS_SUCCESS) { @@ -1193,10 +1229,10 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, return status; } if ((parse_res = _nss_nisplus_parse_pwent (res, result, buffer, - buflen)) == -1) + buflen, errnop)) == -1) { nis_freeresult (res); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } nis_freeresult (res); @@ -1208,25 +1244,28 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } sprintf (buf, "%d", uid); if (yp_match (domain, "passwd.byuid", buf, strlen (buf), &outval, &outvallen) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } ptr = strncpy (buffer, outval, buflen < (size_t) outvallen ? buflen : (size_t) outvallen); buffer[buflen < (size_t) outvallen ? buflen : (size_t) outvallen] = '\0'; free (outval); while (isspace (*ptr)) ptr++; - if ((parse_res = _nss_files_parse_pwent (ptr, result, data, buflen)) - == -1) - { - __set_errno (ERANGE); - return NSS_STATUS_TRYAGAIN; - } + parse_res = _nss_files_parse_pwent (ptr, result, data, buflen, errnop); + if (parse_res == -1) + return NSS_STATUS_TRYAGAIN; } if (parse_res > 0) @@ -1248,7 +1287,7 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, /* Searches in /etc/passwd and the NIS/NIS+ map for a special user id */ static enum nss_status internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; @@ -1263,7 +1302,16 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, fgetpos (ent->stream, &pos); p = fgets (buffer, buflen, ent->stream); if (p == NULL) - return NSS_STATUS_NOTFOUND; + { + if (feof (ent->stream)) + return NSS_STATUS_NOTFOUND; + else + { + fsetpos (ent->stream, &pos); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + } /* Terminate the line for any case. */ buffer[buflen - 1] = '\0'; @@ -1275,13 +1323,14 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !(parse_res = _nss_files_parse_pwent (p, result, data, buflen))); + !(parse_res = _nss_files_parse_pwent (p, result, data, buflen, + errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -1298,14 +1347,15 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, if (result->pw_name[0] == '-' && result->pw_name[1] == '@' && result->pw_name[2] != '\0') { + /* XXX Do not use fixed length buffers. */ char buf2[1024]; char *user, *host, *domain; struct __netgrent netgrdata; bzero (&netgrdata, sizeof (struct __netgrent)); __internal_setnetgrent (&result->pw_name[2], &netgrdata); - while (__internal_getnetgrent_r (&host, &user, &domain, - &netgrdata, buf2, sizeof (buf2))) + while (__internal_getnetgrent_r (&host, &user, &domain, &netgrdata, + buf2, sizeof (buf2), errnop)) { if (user != NULL && user[0] != '-') blacklist_store_name (user, ent); @@ -1330,10 +1380,10 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, { if (use_nisplus) status = getpwent_next_nisplus_netgr (NULL, result, ent, buf, - buffer, buflen); + buffer, buflen, errnop); else status = getpwent_next_nis_netgr (NULL, result, ent, buf, - buffer, buflen); + buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) continue; @@ -1361,7 +1411,7 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, /etc/passwd */ blacklist_store_name (&result->pw_name[1], ent); status = getpwnam_plususer (&result->pw_name[1], result, buffer, - buflen); + buflen, errnop); if (status == NSS_STATUS_SUCCESS && result->pw_uid == uid) break; else @@ -1373,7 +1423,7 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, { enum nss_status status; - status = getpwuid_plususer (uid, result, buffer, buflen); + status = getpwuid_plususer (uid, result, buffer, buflen, errnop); if (status == NSS_STATUS_SUCCESS) /* We found the entry. */ break; else @@ -1388,7 +1438,7 @@ internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent, enum nss_status _nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}, {NULL, NULL, 0, 0, NULL, NULL, NULL}}; @@ -1408,7 +1458,7 @@ _nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd, if (status != NSS_STATUS_SUCCESS) return status; - status = internal_getpwuid_r (uid, pwd, &ent, buffer, buflen); + status = internal_getpwuid_r (uid, pwd, &ent, buffer, buflen, errnop); internal_endpwent (&ent); diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index 5da19d3feb..92224f8ae7 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -291,7 +291,7 @@ _nss_compat_endspent (void) static enum nss_status getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent, - char *group, char *buffer, size_t buflen) + char *group, char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; char *ypdomain, *host, *user, *domain, *outval, *p, *p2; @@ -320,7 +320,8 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent, saved_cursor = ent->netgrdata.cursor; status = __internal_getnetgrent_r (&host, &user, &domain, - &ent->netgrdata, buffer, buflen); + &ent->netgrdata, buffer, buflen, + errnop); if (status != 1) { __internal_endnetgrent (&ent->netgrdata); @@ -348,7 +349,7 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent, p2len = spwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); @@ -357,7 +358,8 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent, while (isspace (*p)) p++; free (outval); - if ((parse_res = _nss_files_parse_spent (p, result, data, buflen)) == -1) + parse_res = _nss_files_parse_spent (p, result, data, buflen, errnop); + if (parse_res == -1) { ent->netgrdata.cursor = saved_cursor; return NSS_STATUS_TRYAGAIN; @@ -379,7 +381,7 @@ getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent, static enum nss_status getspent_next_nisplus_netgr (const char *name, struct spwd *result, ent_t *ent, char *group, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { char *ypdomain, *host, *user, *domain, *p2; int status, parse_res; @@ -409,7 +411,8 @@ getspent_next_nisplus_netgr (const char *name, struct spwd *result, saved_cursor = ent->netgrdata.cursor; status = __internal_getnetgrent_r (&host, &user, &domain, - &ent->netgrdata, buffer, buflen); + &ent->netgrdata, buffer, buflen, + errnop); if (status != 1) { __internal_endnetgrent (&ent->netgrdata); @@ -432,25 +435,27 @@ getspent_next_nisplus_netgr (const char *name, struct spwd *result, p2len = spwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); buflen -= p2len; { char buf[strlen (user) + 30 + pwdtablelen]; - sprintf(buf, "[name=%s],%s", user, pwdtable); - nisres = nis_list(buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL); + sprintf (buf, "[name=%s],%s", user, pwdtable); + nisres = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL); } if (niserr2nss (nisres->status) != NSS_STATUS_SUCCESS) { nis_freeresult (nisres); continue; } - if ((parse_res = _nss_nisplus_parse_spent (nisres, result, buffer, - buflen)) == -1) + parse_res = _nss_nisplus_parse_spent (nisres, result, buffer, + buflen, errnop); + if (parse_res == -1) { nis_freeresult (nisres); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } nis_freeresult (nisres); @@ -470,7 +475,7 @@ getspent_next_nisplus_netgr (const char *name, struct spwd *result, static enum nss_status getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { int parse_res; size_t p2len; @@ -479,7 +484,7 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer, p2len = spwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); @@ -494,7 +499,7 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer, saved_first = TRUE; saved_res = ent->result; - ent->result = nis_first_entry(pwdtable); + ent->result = nis_first_entry (pwdtable); if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS) { ent->nis = 0; @@ -510,7 +515,7 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer, saved_first = FALSE; saved_res = ent->result; - res = nis_next_entry(pwdtable, &ent->result->cookie); + res = nis_next_entry (pwdtable, &ent->result->cookie); ent->result = res; if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS) { @@ -520,13 +525,14 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer, return niserr2nss (ent->result->status); } } - if ((parse_res = _nss_nisplus_parse_spent (ent->result, result, buffer, - buflen)) == -1) + parse_res = _nss_nisplus_parse_spent (ent->result, result, buffer, + buflen, errnop); + if (parse_res == -1) { ent->first = saved_first; nis_freeresult (ent->result); ent->result = saved_res; - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } else @@ -548,7 +554,7 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer, static enum nss_status getspent_next_nis (struct spwd *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; char *domain, *outkey, *outval, *p, *p2; @@ -565,7 +571,7 @@ getspent_next_nis (struct spwd *result, ent_t *ent, p2len = spwd_need_buflen (&ent->pwd); if (p2len > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p2 = buffer + (buflen - p2len); @@ -618,13 +624,14 @@ getspent_next_nis (struct spwd *result, ent_t *ent, while (isspace (*p)) ++p; - if ((parse_res = _nss_files_parse_spent (p, result, data, buflen)) == -1) + parse_res = _nss_files_parse_spent (p, result, data, buflen, errnop); + if (parse_res == -1) { free (ent->oldkey); ent->oldkey = saved_oldkey; ent->oldkeylen = saved_oldlen; ent->first = saved_first; - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } else @@ -646,7 +653,7 @@ getspent_next_nis (struct spwd *result, ent_t *ent, /* This function handle the +user entrys in /etc/shadow */ static enum nss_status getspnam_plususer (const char *name, struct spwd *result, char *buffer, - size_t buflen) + size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; struct spwd pwd; @@ -661,7 +668,7 @@ getspnam_plususer (const char *name, struct spwd *result, char *buffer, plen = spwd_need_buflen (&pwd); if (plen > buflen) { - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } p = buffer + (buflen - plen); @@ -681,10 +688,12 @@ getspnam_plususer (const char *name, struct spwd *result, char *buffer, nis_freeresult (res); return status; } - if ((parse_res = _nss_nisplus_parse_spent (res, result, buffer, - buflen)) == -1) + parse_res = _nss_nisplus_parse_spent (res, result, buffer, + buflen, errnop); + if (parse_res == -1) { nis_freeresult (res); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } nis_freeresult (res); @@ -695,24 +704,27 @@ getspnam_plususer (const char *name, struct spwd *result, char *buffer, int outvallen; if (yp_get_default_domain (&domain) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } if (yp_match (domain, "shadow.byname", name, strlen (name), &outval, &outvallen) != YPERR_SUCCESS) - return NSS_STATUS_TRYAGAIN; + { + *errnop = errno; + return NSS_STATUS_TRYAGAIN; + } ptr = strncpy (buffer, outval, buflen < (size_t) outvallen ? buflen : (size_t) outvallen); buffer[buflen < (size_t) outvallen ? buflen : (size_t) outvallen] = '\0'; free (outval); while (isspace (*ptr)) ptr++; - if ((parse_res = _nss_files_parse_spent (ptr, result, data, buflen)) - == -1) - { - __set_errno (ERANGE); - return NSS_STATUS_TRYAGAIN; - } + parse_res = _nss_files_parse_spent (ptr, result, data, buflen, errnop); + if (parse_res == -1) + return NSS_STATUS_TRYAGAIN; } if (parse_res) @@ -733,7 +745,7 @@ getspnam_plususer (const char *name, struct spwd *result, char *buffer, static enum nss_status getspent_next_file (struct spwd *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; while (1) @@ -760,13 +772,13 @@ getspent_next_file (struct spwd *result, ent_t *ent, /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ || !(parse_res = _nss_files_parse_spent (p, result, data, - buflen))); + buflen, errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -778,6 +790,7 @@ getspent_next_file (struct spwd *result, ent_t *ent, if (result->sp_namp[0] == '-' && result->sp_namp[1] == '@' && result->sp_namp[2] != '\0') { + /* XXX Do not use fixed length buffers. */ char buf2[1024]; char *user, *host, *domain; struct __netgrent netgrdata; @@ -785,7 +798,8 @@ getspent_next_file (struct spwd *result, ent_t *ent, bzero (&netgrdata, sizeof (struct __netgrent)); __internal_setnetgrent (&result->sp_namp[2], &netgrdata); while (__internal_getnetgrent_r (&host, &user, &domain, - &netgrdata, buf2, sizeof (buf2))) + &netgrdata, buf2, sizeof (buf2), + errnop)) { if (user != NULL && user[0] != '-') blacklist_store_name (user, ent); @@ -807,11 +821,11 @@ getspent_next_file (struct spwd *result, ent_t *ent, if (use_nisplus) status = getspent_next_nisplus_netgr (NULL, result, ent, &result->sp_namp[2], - buffer, buflen); + buffer, buflen, errnop); else status = getspent_next_nis_netgr (NULL, result, ent, &result->sp_namp[2], - buffer, buflen); + buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) continue; else @@ -836,14 +850,21 @@ getspent_next_file (struct spwd *result, ent_t *ent, /etc/passwd */ blacklist_store_name (&result->sp_namp[1], ent); status = getspnam_plususer (&result->sp_namp[1], result, buffer, - buflen); + buflen, errnop); if (status == NSS_STATUS_SUCCESS) /* We found the entry. */ break; else if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ continue; else - return status; + { + if (status == NSS_STATUS_TRYAGAIN) + { + fsetpos (ent->stream, &pos); + *errnop = ERANGE; + } + return status; + } } /* +:... */ @@ -854,9 +875,9 @@ getspent_next_file (struct spwd *result, ent_t *ent, copy_spwd_changes (&ent->pwd, result, NULL, 0); if (use_nisplus) - return getspent_next_nisplus (result, ent, buffer, buflen); + return getspent_next_nisplus (result, ent, buffer, buflen, errnop); else - return getspent_next_nis (result, ent, buffer, buflen); + return getspent_next_nis (result, ent, buffer, buflen, errnop); } } @@ -866,7 +887,7 @@ getspent_next_file (struct spwd *result, ent_t *ent, static enum nss_status internal_getspent_r (struct spwd *pw, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { if (ent->netgroup) { @@ -876,11 +897,12 @@ internal_getspent_r (struct spwd *pw, ent_t *ent, /* Since this is not the first call, we don't need the group name */ if (use_nisplus) status = getspent_next_nisplus_netgr (NULL, pw, ent, NULL, buffer, - buflen); + buflen, errnop); else - status = getspent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen); + status = getspent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen, + errnop); if (status == NSS_STATUS_RETURN) - return getspent_next_file (pw, ent, buffer, buflen); + return getspent_next_file (pw, ent, buffer, buflen, errnop); else return status; } @@ -888,16 +910,17 @@ internal_getspent_r (struct spwd *pw, ent_t *ent, if (ent->nis) { if (use_nisplus) - return getspent_next_nisplus (pw, ent, buffer, buflen); + return getspent_next_nisplus (pw, ent, buffer, buflen, errnop); else - return getspent_next_nis (pw, ent, buffer, buflen); + return getspent_next_nis (pw, ent, buffer, buflen, errnop); } else - return getspent_next_file (pw, ent, buffer, buflen); + return getspent_next_file (pw, ent, buffer, buflen, errnop); } enum nss_status -_nss_compat_getspent_r (struct spwd *pwd, char *buffer, size_t buflen) +_nss_compat_getspent_r (struct spwd *pwd, char *buffer, size_t buflen, + int *errnop) { enum nss_status status = NSS_STATUS_SUCCESS; @@ -914,7 +937,7 @@ _nss_compat_getspent_r (struct spwd *pwd, char *buffer, size_t buflen) status = internal_setspent (&ext_ent); if (status == NSS_STATUS_SUCCESS) - status = internal_getspent_r (pwd, &ext_ent, buffer, buflen); + status = internal_getspent_r (pwd, &ext_ent, buffer, buflen, errnop); __libc_lock_unlock (lock); @@ -924,7 +947,7 @@ _nss_compat_getspent_r (struct spwd *pwd, char *buffer, size_t buflen) /* Searches in /etc/passwd and the NIS/NIS+ map for a special user */ static enum nss_status internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { struct parser_data *data = (void *) buffer; @@ -951,13 +974,14 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !(parse_res = _nss_files_parse_spent (p, result, data, buflen))); + !(parse_res = _nss_files_parse_spent (p, result, data, buflen, + errnop))); if (parse_res == -1) { /* The parser ran out of space. */ fsetpos (ent->stream, &pos); - __set_errno (ERANGE); + *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -974,14 +998,15 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, if (result->sp_namp[0] == '-' && result->sp_namp[1] == '@' && result->sp_namp[2] != '\0') { + /* XXX Do not use fixed length buffers. */ char buf2[1024]; char *user, *host, *domain; struct __netgrent netgrdata; bzero (&netgrdata, sizeof (struct __netgrent)); __internal_setnetgrent (&result->sp_namp[2], &netgrdata); - while (__internal_getnetgrent_r (&host, &user, &domain, - &netgrdata, buf2, sizeof (buf2))) + while (__internal_getnetgrent_r (&host, &user, &domain, &netgrdata, + buf2, sizeof (buf2), errnop)) { if (user != NULL && user[0] != '-') if (strcmp (user, name) == 0) @@ -995,10 +1020,9 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, if (result->sp_namp[0] == '+' && result->sp_namp[1] == '@' && result->sp_namp[2] != '\0') { - char buf[strlen (result->sp_namp)]; + char *buf = strdupa (&result->sp_namp[2]); int status; - strcpy (buf, &result->sp_namp[2]); ent->netgroup = TRUE; ent->first = TRUE; copy_spwd_changes (&ent->pwd, result, NULL, 0); @@ -1007,15 +1031,15 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, { if (use_nisplus) status = getspent_next_nisplus_netgr (name, result, ent, buf, - buffer, buflen); + buffer, buflen, errnop); else status = getspent_next_nis_netgr (name, result, ent, buf, - buffer, buflen); + buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) continue; - if (status == NSS_STATUS_SUCCESS && - strcmp (result->sp_namp, name) == 0) + if (status == NSS_STATUS_SUCCESS + && strcmp (result->sp_namp, name) == 0) return NSS_STATUS_SUCCESS; } while (status == NSS_STATUS_SUCCESS); continue; @@ -1039,7 +1063,8 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, { enum nss_status status; - status = getspnam_plususer (name, result, buffer, buflen); + status = getspnam_plususer (name, result, buffer, buflen, + errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ return NSS_STATUS_NOTFOUND; @@ -1053,7 +1078,7 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, { enum nss_status status; - status = getspnam_plususer (name, result, buffer, buflen); + status = getspnam_plususer (name, result, buffer, buflen, errnop); if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */ return NSS_STATUS_NOTFOUND; else @@ -1065,7 +1090,7 @@ internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent, enum nss_status _nss_compat_getspnam_r (const char *name, struct spwd *pwd, - char *buffer, size_t buflen) + char *buffer, size_t buflen, int *errnop) { ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}, {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}}; @@ -1084,7 +1109,7 @@ _nss_compat_getspnam_r (const char *name, struct spwd *pwd, if (status != NSS_STATUS_SUCCESS) return status; - status = internal_getspnam_r (name, pwd, &ent, buffer, buflen); + status = internal_getspnam_r (name, pwd, &ent, buffer, buflen, errnop); internal_endspent (&ent); |