From: Andreas Schwab <schwab@redhat.com>
To: libc-hacker@sourceware.org
Subject: [PATCH] nss_compat: query NIS domain only when needed
Date: Fri, 01 Jul 2011 10:29:00 -0000 [thread overview]
Message-ID: <m339iqfg5c.fsf@redhat.com> (raw)
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."
reply other threads:[~2011-07-01 10:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m339iqfg5c.fsf@redhat.com \
--to=schwab@redhat.com \
--cc=libc-hacker@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).