aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nis/nss_compat/compat-pwd.c27
-rw-r--r--nis/nss_compat/compat-spwd.c27
3 files changed, 35 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index db26998..e3a0b70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* sysdeps/posix/getaddrinfo.c (gaih_inet): Make sure RES_USE_INET6
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)