qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nss_compat: query NIS domain only when needed

This commit is contained in:
Andreas Schwab 2011-07-01 18:37:28 -04:00 committed by Ulrich Drepper
parent 6f8326cacd
commit 6d4d8e8eef
3 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-07-01 Andreas Schwab <schwab@redhat.com>
* nis/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Query NIS
domain only when needed.
2011-06-30 Andreas Schwab <schwab@redhat.com> 2011-06-30 Andreas Schwab <schwab@redhat.com>
* sysdeps/posix/getaddrinfo.c (gaih_inet): Make sure RES_USE_INET6 * sysdeps/posix/getaddrinfo.c (gaih_inet): Make sure RES_USE_INET6

27
nis/nss_compat/compat-pwd.c
View File

@ -361,7 +361,7 @@ getpwent_next_nss_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) int *errnop)
{ {
char *curdomain, *host, *user, *domain, *p2; char *curdomain = NULL, *host, *user, *domain, *p2;
int status; int status;
size_t p2len; size_t p2len;
@ -370,15 +370,7 @@ getpwent_next_nss_netgr (const char *name, struct passwd *result, ent_t *ent,
if (!nss_getpwnam_r) if (!nss_getpwnam_r)
return NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
if (yp_get_default_domain (&curdomain) != YPERR_SUCCESS) if (ent->first)
{
ent->netgroup = false;
ent->first = false;
give_pwd_free (&ent->pwd);
return NSS_STATUS_UNAVAIL;
}
if (ent->first == true)
{ {
memset (&ent->netgrdata, 0, sizeof (struct __netgrent)); memset (&ent->netgrdata, 0, sizeof (struct __netgrent));
__internal_setnetgrent (group, &ent->netgrdata); __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] == '-') if (user == NULL || user[0] == '-')
continue; continue;
if (domain != NULL && strcmp (curdomain, domain) != 0) if (domain != NULL)
continue; {
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, we are called from getpwnam. */
if (name != NULL) if (name != NULL)

27
nis/nss_compat/compat-spwd.c
View File

@ -318,7 +318,7 @@ getspent_next_nss_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) int *errnop)
{ {
char *curdomain, *host, *user, *domain, *p2; char *curdomain = NULL, *host, *user, *domain, *p2;
size_t p2len; size_t p2len;
if (!nss_getspnam_r) 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) if (ent->setent_status != NSS_STATUS_SUCCESS)
return ent->setent_status; return ent->setent_status;
if (yp_get_default_domain (&curdomain) != YPERR_SUCCESS) if (ent->first)
{
ent->netgroup = false;
ent->first = false;
give_spwd_free (&ent->pwd);
return NSS_STATUS_UNAVAIL;
}
if (ent->first == true)
{ {
memset (&ent->netgrdata, 0, sizeof (struct __netgrent)); memset (&ent->netgrdata, 0, sizeof (struct __netgrent));
__internal_setnetgrent (group, &ent->netgrdata); __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] == '-') if (user == NULL || user[0] == '-')
continue; continue;
if (domain != NULL && strcmp (curdomain, domain) != 0) if (domain != NULL)
continue; {
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, we are called from getpwnam */
if (name != NULL) if (name != NULL)