This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
2011-07-01 Andreas Schwab <schwab@redhat.com> * nis/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Query NIS domain only when needed. --- nis/nss_compat/compat-pwd.c | 27 +++++++++++++++------------ nis/nss_compat/compat-spwd.c | 27 +++++++++++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 6462a85..5107f51 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -361,7 +361,7 @@ getpwent_next_nss_netgr (const char *name, struct passwd *result, ent_t *ent, char *group, char *buffer, size_t buflen, int *errnop) { - char *curdomain, *host, *user, *domain, *p2; + char *curdomain = NULL, *host, *user, *domain, *p2; int status; size_t p2len; @@ -370,15 +370,7 @@ getpwent_next_nss_netgr (const char *name, struct passwd *result, ent_t *ent, if (!nss_getpwnam_r) return NSS_STATUS_UNAVAIL; - if (yp_get_default_domain (&curdomain) != YPERR_SUCCESS) - { - ent->netgroup = false; - ent->first = false; - give_pwd_free (&ent->pwd); - return NSS_STATUS_UNAVAIL; - } - - if (ent->first == true) + if (ent->first) { memset (&ent->netgrdata, 0, sizeof (struct __netgrent)); __internal_setnetgrent (group, &ent->netgrdata); @@ -401,8 +393,19 @@ getpwent_next_nss_netgr (const char *name, struct passwd *result, ent_t *ent, if (user == NULL || user[0] == '-') continue; - if (domain != NULL && strcmp (curdomain, domain) != 0) - continue; + if (domain != NULL) + { + if (curdomain == NULL + && yp_get_default_domain (&curdomain) != YPERR_SUCCESS) + { + __internal_endnetgrent (&ent->netgrdata); + ent->netgroup = false; + give_pwd_free (&ent->pwd); + return NSS_STATUS_UNAVAIL; + } + if (strcmp (curdomain, domain) != 0) + continue; + } /* If name != NULL, we are called from getpwnam. */ if (name != NULL) diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index 6699259..f33dd3e 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -318,7 +318,7 @@ getspent_next_nss_netgr (const char *name, struct spwd *result, ent_t *ent, char *group, char *buffer, size_t buflen, int *errnop) { - char *curdomain, *host, *user, *domain, *p2; + char *curdomain = NULL, *host, *user, *domain, *p2; size_t p2len; if (!nss_getspnam_r) @@ -328,15 +328,7 @@ getspent_next_nss_netgr (const char *name, struct spwd *result, ent_t *ent, if (ent->setent_status != NSS_STATUS_SUCCESS) return ent->setent_status; - if (yp_get_default_domain (&curdomain) != YPERR_SUCCESS) - { - ent->netgroup = false; - ent->first = false; - give_spwd_free (&ent->pwd); - return NSS_STATUS_UNAVAIL; - } - - if (ent->first == true) + if (ent->first) { memset (&ent->netgrdata, 0, sizeof (struct __netgrent)); __internal_setnetgrent (group, &ent->netgrdata); @@ -361,8 +353,19 @@ getspent_next_nss_netgr (const char *name, struct spwd *result, ent_t *ent, if (user == NULL || user[0] == '-') continue; - if (domain != NULL && strcmp (curdomain, domain) != 0) - continue; + if (domain != NULL) + { + if (curdomain == NULL + && yp_get_default_domain (&curdomain) != YPERR_SUCCESS) + { + __internal_endnetgrent (&ent->netgrdata); + ent->netgroup = false; + give_spwd_free (&ent->pwd); + return NSS_STATUS_UNAVAIL; + } + if (strcmp (curdomain, domain) != 0) + continue; + } /* If name != NULL, we are called from getpwnam */ if (name != NULL) -- 1.7.6 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |