summaryrefslogtreecommitdiff
path: root/nis/nss_compat/compat-pwd.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-07-06 21:06:29 +0000
committerUlrich Drepper <drepper@redhat.com>2005-07-06 21:06:29 +0000
commit016c70ea61aa2a896c7862b70e1cf4e705ba21af (patch)
treefe6ed3992d1f3557de2a219c7ed57d78e790d157 /nis/nss_compat/compat-pwd.c
parentec73fd87dacd5815ee71c9b81d426608151418f8 (diff)
downloadglibc-016c70ea61aa2a896c7862b70e1cf4e705ba21af.tar.gz
* nis/nss_compat/compat-grp.c (internal_getgrgid_r): Check if NSS
module provides getgrgid_r. (getgrnam_plusgroup): Preserve original return value. * nis/nss_compat/compat-pwd.c (getpwnam_plususer): Preserve original return value. * nis/nss_compat/compat-spwd.c (getspnam_plususer): Likewise.
Diffstat (limited to 'nis/nss_compat/compat-pwd.c')
-rw-r--r--nis/nss_compat/compat-pwd.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 89a6a7013e..43ccb27071 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1999,2001,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999,2001-2004,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
@@ -453,29 +453,27 @@ static enum nss_status
getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent,
char *buffer, size_t buflen, int *errnop)
{
- struct passwd pwd;
- char *p;
- size_t plen;
-
if (!nss_getpwnam_r)
return NSS_STATUS_UNAVAIL;
+ struct passwd pwd;
memset (&pwd, '\0', sizeof (struct passwd));
copy_pwd_changes (&pwd, result, NULL, 0);
- plen = pwd_need_buflen (&pwd);
+ size_t plen = pwd_need_buflen (&pwd);
if (plen > buflen)
{
*errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
- p = buffer + (buflen - plen);
+ char *p = buffer + (buflen - plen);
buflen -= plen;
- if (nss_getpwnam_r (name, result, buffer, buflen, errnop) !=
- NSS_STATUS_SUCCESS)
- return NSS_STATUS_NOTFOUND;
+ enum nss_status status = nss_getpwnam_r (name, result, buffer, buflen,
+ errnop);
+ if (status != NSS_STATUS_SUCCESS)
+ return status;
if (in_blacklist (result->pw_name, strlen (result->pw_name), ent))
return NSS_STATUS_NOTFOUND;