How to get LDAP support in NSS/compat?
Thorsten Kukuk
kukuk@suse.de
Tue May 20 09:56:00 GMT 2003
On Tue, May 20, Petter Reinholdtsen wrote:
> [Thorsten Kukuk]
> > Here is a patch for the compat passwd function.
>
> Did you forget to attach the patch? It was not in the mail.
Yes, I did...
--
Thorsten Kukuk http://www.suse.de/~kukuk/ kukuk@suse.de
SuSE Linux AG Deutschherrnstr. 15-19 D-90429 Nuernberg
--------------------------------------------------------------------
Key fingerprint = A368 676B 5E1B 3E46 CFCE 2D97 F8FD 4E23 56C6 FB4B
-------------- next part --------------
--- nis/nss_compat/compat-pwd.c 2003/05/16 10:14:10 1.1
+++ nis/nss_comapt/compat-pwd.c 2003/05/20 08:19:18
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
@@ -24,20 +24,24 @@
#include <fcntl.h>
#include <netdb.h>
#include <string.h>
-#include <bits/libc-lock.h>
-#include <rpcsvc/yp.h>
+#include <rpc/types.h>
#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/nis.h>
+#include <bits/libc-lock.h>
#include <nsswitch.h>
#include "netgroup.h"
-#include "nss-nisplus.h"
-#include "nisplus-parser.h"
static service_user *ni;
-static bool_t use_nisplus; /* default: passwd_compat: nis */
-static nis_name pwdtable; /* Name of the pwd table */
-static size_t pwdtablelen;
+static enum nss_status (*nss_setpwent)(int stayopen);
+static enum nss_status (*nss_getpwnam_r)(const char *name, struct passwd *pwd,
+ char *buffer, size_t buflen,
+ int *errnop);
+static enum nss_status (*nss_getpwuid_r)(uid_t uid, struct passwd *pwd,
+ char *buffer, size_t buflen,
+ int *errnop);
+static enum nss_status (*nss_getpwent_r)(struct passwd *pwd, char *buffer,
+ size_t buflen, int *errnop);
+static enum nss_status (*nss_endpwent)(void);
/* Get the declaration of the parser function. */
#define ENTNAME pwent
@@ -58,11 +62,8 @@
struct ent_t
{
bool_t netgroup;
- bool_t nis;
bool_t first;
- char *oldkey;
- int oldkeylen;
- nis_result *result;
+ bool_t files;
FILE *stream;
struct blacklist_t blacklist;
struct passwd pwd;
@@ -70,7 +71,7 @@
};
typedef struct ent_t ent_t;
-static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
+static ent_t ext_ent = {0, 0, TRUE, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, NULL, NULL, NULL}};
/* Protect global state against multiple changers. */
@@ -80,6 +81,21 @@
static void blacklist_store_name (const char *, ent_t *);
static int in_blacklist (const char *, int, ent_t *);
+/* Initialize the NSS interface/functions. The calling function must
+ hold the lock. */
+static enum nss_status
+init_nss_interface (void)
+{
+ __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
+ nss_setpwent = __nss_lookup_function (ni, "setpwent");
+ nss_getpwnam_r = __nss_lookup_function (ni, "getpwnam_r");
+ nss_getpwuid_r = __nss_lookup_function (ni, "getpwuid_r");
+ nss_getpwent_r = __nss_lookup_function (ni, "getpwent_r");
+ nss_endpwent = __nss_lookup_function (ni, "endpwent");
+
+ return NSS_STATUS_SUCCESS;
+}
+
static void
give_pwd_free (struct passwd *pwd)
{
@@ -186,100 +202,16 @@
}
static enum nss_status
-insert_passwd_adjunct (char **result, int *len, char *domain, int *errnop)
-{
- char *p1, *p2, *result2, *res;
- int len2;
- size_t namelen;
-
- /* Check for adjunct style secret passwords. They can be
- recognized by a password starting with "##". */
- p1 = strchr (*result, ':');
- if (p1 == NULL || p1[1] != '#' || p1[2] != '#')
- return NSS_STATUS_SUCCESS;
- p2 = strchr (p1 + 3, ':');
-
- namelen = p2 - p1 - 3;
-
- if (yp_match (domain, "passwd.adjunct.byname", &p1[3], namelen,
- &result2, &len2) == YPERR_SUCCESS)
- {
- /* We found a passwd.adjunct entry. Merge encrypted
- password therein into original result. */
- char *encrypted = strchr (result2, ':');
- char *endp;
- size_t restlen;
-
- if (encrypted == NULL || (endp = strchr (++encrypted, ':')) == NULL)
- {
- /* Invalid format of the entry. This never should happen
- unless the data from which the NIS table is generated is
- wrong. We simply ignore it. */
- free (result2);
- return NSS_STATUS_SUCCESS;
- }
-
- restlen = *len - (p2 - *result);
- if ((res = malloc (namelen + restlen + (endp - encrypted) + 2)) == NULL)
- {
- free (result2);
- return NSS_STATUS_TRYAGAIN;
- }
-
- __mempcpy (__mempcpy (__mempcpy (__mempcpy
- (res, *result, (p1 - *result)),
- ":", 1),
- encrypted, endp - encrypted),
- p2, restlen + 1);
-
- free (result2);
- free (*result);
- *result = res;
- *len = strlen (res);
- }
- return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-internal_setpwent (ent_t *ent)
+internal_setpwent (ent_t *ent, int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
- ent->nis = ent->first = ent->netgroup = 0;
+ ent->first = ent->netgroup = FALSE;
/* If something was left over free it. */
if (ent->netgroup)
__internal_endnetgrent (&ent->netgrdata);
- if (ent->oldkey != NULL)
- {
- free (ent->oldkey);
- ent->oldkey = NULL;
- ent->oldkeylen = 0;
- }
-
- if (ent->result != NULL)
- {
- nis_freeresult (ent->result);
- ent->result = NULL;
- }
-
- if (pwdtable == NULL)
- {
- static const char key[] = "passwd.org_dir.";
- const char *local_dir = nis_local_directory ();
- size_t len_local_dir = strlen (local_dir);
-
- pwdtable = malloc (sizeof (key) + len_local_dir);
- if (pwdtable == NULL)
- return NSS_STATUS_TRYAGAIN;
-
- pwdtablelen = ((char *) mempcpy (mempcpy (pwdtable,
- key, sizeof (key) - 1),
- local_dir, len_local_dir + 1)
- - pwdtable) - 1;
- }
-
if (ent->blacklist.data != NULL)
{
ent->blacklist.current = 1;
@@ -321,6 +253,9 @@
give_pwd_free (&ent->pwd);
+ if (status == NSS_STATUS_SUCCESS)
+ return nss_setpwent (stayopen);
+
return status;
}
@@ -333,12 +268,9 @@
__libc_lock_lock (lock);
if (ni == NULL)
- {
- __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
+ init_nss_interface ();
- result = internal_setpwent (&ext_ent);
+ result = internal_setpwent (&ext_ent, stayopen);
__libc_lock_unlock (lock);
@@ -349,6 +281,9 @@
static enum nss_status
internal_endpwent (ent_t *ent)
{
+ if (nss_endpwent)
+ nss_endpwent();
+
if (ent->stream != NULL)
{
fclose (ent->stream);
@@ -358,26 +293,13 @@
if (ent->netgroup)
__internal_endnetgrent (&ent->netgrdata);
- ent->nis = ent->first = ent->netgroup = 0;
-
- if (ent->oldkey != NULL)
- {
- free (ent->oldkey);
- ent->oldkey = NULL;
- ent->oldkeylen = 0;
- }
-
- if (ent->result != NULL)
- {
- nis_freeresult (ent->result);
- ent->result = NULL;
- }
+ ent->first = ent->netgroup = FALSE;
if (ent->blacklist.data != NULL)
{
ent->blacklist.current = 1;
ent->blacklist.data[0] = '|';
- ent->blacklist.data[1] = '\0';
+ ent->blacklist.data[1] = '\0';
}
else
ent->blacklist.current = 0;
@@ -400,20 +322,18 @@
return result;
}
-
static enum nss_status
-getpwent_next_nis_netgr (const char *name, struct passwd *result, ent_t *ent,
+getpwent_next_nss_netgr (const char *name, struct passwd *result, ent_t *ent,
char *group, char *buffer, size_t buflen, int *errnop)
{
- struct parser_data *data = (void *) buffer;
- char *ypdomain, *host, *user, *domain, *outval, *p, *p2;
- int status, outvallen;
+ char *ypdomain, *host, *user, *domain, *p2;
+ int status;
size_t p2len;
if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
{
- ent->netgroup = 0;
- ent->first = 0;
+ ent->netgroup = FALSE;
+ ent->first = FALSE;
give_pwd_free (&ent->pwd);
return NSS_STATUS_UNAVAIL;
}
@@ -428,7 +348,6 @@
while (1)
{
char *saved_cursor;
- int parse_res;
saved_cursor = ent->netgrdata.cursor;
status = __internal_getnetgrent_r (&host, &user, &domain,
@@ -453,148 +372,23 @@
if (strcmp (user, name) != 0)
continue;
- if (yp_match (ypdomain, "passwd.byname", user,
- strlen (user), &outval, &outvallen)
- != YPERR_SUCCESS)
- continue;
-
- if (insert_passwd_adjunct (&outval, &outvallen, ypdomain, errnop)
- != NSS_STATUS_SUCCESS)
- {
- free (outval);
- return NSS_STATUS_TRYAGAIN;
- }
-
p2len = pwd_need_buflen (&ent->pwd);
if (p2len > buflen)
{
- free (outval);
*errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
p2 = buffer + (buflen - p2len);
buflen -= p2len;
- if (buflen < ((size_t) outvallen + 1))
- {
- free (outval);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- p = strncpy (buffer, outval, buflen);
-
- while (isspace (*p))
- p++;
- free (outval);
- parse_res = _nss_files_parse_pwent (p, result, data, buflen, errnop);
- if (parse_res == -1)
- {
- ent->netgrdata.cursor = saved_cursor;
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (parse_res && !in_blacklist (result->pw_name,
- strlen (result->pw_name), ent))
- {
- /* Store the User in the blacklist for the "+" at the end of
- /etc/passwd */
- blacklist_store_name (result->pw_name, ent);
- copy_pwd_changes (result, &ent->pwd, p2, p2len);
- break;
- }
- }
-
- return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-getpwent_next_nisplus_netgr (const char *name, struct passwd *result,
- ent_t *ent, char *group, char *buffer,
- size_t buflen, int *errnop)
-{
- char *ypdomain, *host, *user, *domain, *p2;
- int status, parse_res;
- size_t p2len;
- nis_result *nisres;
-
- /* Maybe we should use domainname here ? We need the current
- domainname for the domain field in netgroups */
- if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
- {
- ent->netgroup = 0;
- ent->first = 0;
- give_pwd_free (&ent->pwd);
- return NSS_STATUS_UNAVAIL;
- }
-
- if (ent->first == TRUE)
- {
- bzero (&ent->netgrdata, sizeof (struct __netgrent));
- __internal_setnetgrent (group, &ent->netgrdata);
- ent->first = FALSE;
- }
-
- while (1)
- {
- char *saved_cursor;
-
- saved_cursor = ent->netgrdata.cursor;
- status = __internal_getnetgrent_r (&host, &user, &domain,
- &ent->netgrdata, buffer, buflen,
- errnop);
- if (status != 1)
- {
- __internal_endnetgrent (&ent->netgrdata);
- ent->netgroup = 0;
- give_pwd_free (&ent->pwd);
- return NSS_STATUS_RETURN;
- }
-
- if (user == NULL || user[0] == '-')
+ if (nss_getpwnam_r (user, result, buffer, buflen, errnop) !=
+ NSS_STATUS_SUCCESS)
continue;
- if (domain != NULL && strcmp (ypdomain, domain) != 0)
- continue;
-
- /* If name != NULL, we are called from getpwnam */
- if (name != NULL)
- if (strcmp (user, name) != 0)
- continue;
-
- p2len = pwd_need_buflen (&ent->pwd);
- if (p2len > buflen)
- {
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- p2 = buffer + (buflen - p2len);
- buflen -= p2len;
- {
- char buf[strlen (user) + 30 + pwdtablelen];
- sprintf(buf, "[name=%s],%s", user, pwdtable);
- nisres = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
- }
- if (niserr2nss (nisres->status) != NSS_STATUS_SUCCESS)
- {
- nis_freeresult (nisres);
- continue;
- }
- parse_res = _nss_nisplus_parse_pwent (nisres, result, buffer,
- buflen, errnop);
- if (parse_res == -1)
- {
- nis_freeresult (nisres);
- ent->netgrdata.cursor = saved_cursor;
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- nis_freeresult (nisres);
-
- if (parse_res && !in_blacklist (result->pw_name,
- strlen (result->pw_name), ent))
+ if (!in_blacklist (result->pw_name, strlen (result->pw_name), ent))
{
- /* Store the User in the blacklist for the "+" at the end of
- /etc/passwd */
+ /* Store the User in the blacklist for possible the "+" at the
+ end of /etc/passwd */
blacklist_store_name (result->pw_name, ent);
copy_pwd_changes (result, &ent->pwd, p2, p2len);
break;
@@ -604,14 +398,14 @@
return NSS_STATUS_SUCCESS;
}
-/* get the next user from NIS+ (+ entry) */
+/* get the next user from NSS (+ entry) */
static enum nss_status
-getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
- size_t buflen, int *errnop)
+getpwent_next_nss (struct passwd *result, ent_t *ent, char *buffer,
+ size_t buflen, int *errnop)
{
- int parse_res;
- size_t p2len;
+ enum nss_status status;
char *p2;
+ size_t p2len;
p2len = pwd_need_buflen (&ent->pwd);
if (p2len > buflen)
@@ -621,189 +415,17 @@
}
p2 = buffer + (buflen - p2len);
buflen -= p2len;
- do
- {
- bool_t saved_first;
- nis_result *saved_res;
- if (ent->first)
- {
- saved_first = TRUE;
- saved_res = ent->result;
+ if (ent->first)
+ ent->first = FALSE;
- ent->result = nis_first_entry (pwdtable);
- if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
- {
- ent->nis = 0;
- give_pwd_free (&ent->pwd);
- return niserr2nss (ent->result->status);
- }
- ent->first = FALSE;
- }
- else
- {
- nis_result *res;
-
- res = nis_next_entry (pwdtable, &ent->result->cookie);
- saved_res = ent->result;
- saved_first = FALSE;
- ent->result = res;
- if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
- {
- ent->nis = 0;
- nis_freeresult (saved_res);
- give_pwd_free (&ent->pwd);
- return niserr2nss (ent->result->status);
- }
- }
- parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer,
- buflen, errnop);
- if (parse_res == -1)
- {
- nis_freeresult (ent->result);
- ent->result = saved_res;
- ent->first = saved_first;
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- else
- {
- if (!saved_first)
- nis_freeresult (saved_res);
- }
-
- if (parse_res &&
- in_blacklist (result->pw_name, strlen (result->pw_name), ent))
- parse_res = 0; /* if result->pw_name in blacklist,search next entry */
- }
- while (!parse_res);
-
- copy_pwd_changes (result, &ent->pwd, p2, p2len);
-
- return NSS_STATUS_SUCCESS;
-}
-
-static enum nss_status
-getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer,
- size_t buflen, int *errnop)
-{
- struct parser_data *data = (void *) buffer;
- char *domain, *outkey, *outval, *p, *p2;
- int outkeylen, outvallen, parse_res;
- size_t p2len;
-
- if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
- {
- ent->nis = 0;
- give_pwd_free (&ent->pwd);
- return NSS_STATUS_UNAVAIL;
- }
-
- p2len = pwd_need_buflen (&ent->pwd);
- if (p2len > buflen)
- {
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- p2 = buffer + (buflen - p2len);
- buflen -= p2len;
do
{
- bool_t saved_first;
- char *saved_oldkey;
- int saved_oldlen;
-
- if (ent->first)
- {
- if (yp_first (domain, "passwd.byname", &outkey, &outkeylen,
- &outval, &outvallen) != YPERR_SUCCESS)
- {
- ent->nis = 0;
- give_pwd_free (&ent->pwd);
- return NSS_STATUS_UNAVAIL;
- }
-
- if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop) !=
- NSS_STATUS_SUCCESS)
- {
- free (outval);
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (buflen < ((size_t) outvallen + 1))
- {
- free (outval);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
-
- saved_first = TRUE;
- saved_oldkey = ent->oldkey;
- saved_oldlen = ent->oldkeylen;
- ent->oldkey = outkey;
- ent->oldkeylen = outkeylen;
- ent->first = FALSE;
- }
- else
- {
- if (yp_next (domain, "passwd.byname", ent->oldkey, ent->oldkeylen,
- &outkey, &outkeylen, &outval, &outvallen)
- != YPERR_SUCCESS)
- {
- ent->nis = 0;
- give_pwd_free (&ent->pwd);
- return NSS_STATUS_NOTFOUND;
- }
-
- if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop)
- != NSS_STATUS_SUCCESS)
- {
- free (outval);
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (buflen < ((size_t) outvallen + 1))
- {
- free (outval);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
-
- saved_first = FALSE;
- saved_oldkey = ent->oldkey;
- saved_oldlen = ent->oldkeylen;
- ent->oldkey = outkey;
- ent->oldkeylen = outkeylen;
- }
-
- /* Copy the found data to our buffer */
- p = strncpy (buffer, outval, buflen);
-
- /* ...and free the data. */
- free (outval);
-
- while (isspace (*p))
- ++p;
- parse_res = _nss_files_parse_pwent (p, result, data, buflen, errnop);
- if (parse_res == -1)
- {
- free (ent->oldkey);
- ent->oldkey = saved_oldkey;
- ent->oldkeylen = saved_oldlen;
- ent->first = saved_first;
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- else
- {
- if (!saved_first)
- free (saved_oldkey);
- }
- if (parse_res
- && in_blacklist (result->pw_name, strlen (result->pw_name), ent))
- parse_res = 0;
+ if ((status = nss_getpwent_r (result, buffer, buflen, errnop)) !=
+ NSS_STATUS_SUCCESS)
+ return status;
}
- while (!parse_res);
+ while (in_blacklist (result->pw_name, strlen (result->pw_name), ent));
copy_pwd_changes (result, &ent->pwd, p2, p2len);
@@ -815,9 +437,7 @@
getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent,
char *buffer, size_t buflen, int *errnop)
{
- struct parser_data *data = (void *) buffer;
struct passwd pwd;
- int parse_res;
char *p;
size_t plen;
@@ -834,88 +454,17 @@
p = buffer + (buflen - plen);
buflen -= plen;
- if (use_nisplus) /* Do the NIS+ query here */
- {
- nis_result *res;
- char buf[strlen (name) + 24 + pwdtablelen];
-
- sprintf(buf, "[name=%s],%s", name, pwdtable);
- res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
- if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
- {
- enum nss_status status = niserr2nss (res->status);
-
- nis_freeresult (res);
- return status;
- }
- parse_res = _nss_nisplus_parse_pwent (res, result, buffer,
- buflen, errnop);
-
- nis_freeresult (res);
-
- if (parse_res == -1)
- {
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (in_blacklist (result->pw_name, strlen (result->pw_name), ent))
- return NSS_STATUS_NOTFOUND;
- }
- else /* Use NIS */
- {
- char *domain, *outval, *ptr;
- int outvallen;
-
- if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
- return NSS_STATUS_NOTFOUND;
-
- if (yp_match (domain, "passwd.byname", name, strlen (name),
- &outval, &outvallen) != YPERR_SUCCESS)
- return NSS_STATUS_NOTFOUND;
-
- if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop)
- != NSS_STATUS_SUCCESS)
- {
- free (outval);
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (buflen < ((size_t) outvallen + 1))
- {
- free (outval);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
-
- ptr = strncpy (buffer, outval, buflen);
- free (outval);
-
- while (isspace (*ptr))
- ptr++;
-
- parse_res = _nss_files_parse_pwent (ptr, result, data, buflen, errnop);
- if (parse_res == -1)
- return NSS_STATUS_TRYAGAIN;
+ if (nss_getpwnam_r (name, result, buffer, buflen, errnop) !=
+ NSS_STATUS_SUCCESS)
+ return NSS_STATUS_NOTFOUND;
- if (in_blacklist (result->pw_name, strlen (result->pw_name), ent))
- return NSS_STATUS_NOTFOUND;
- }
+ if (in_blacklist (result->pw_name, strlen (result->pw_name), ent))
+ return NSS_STATUS_NOTFOUND;
- if (parse_res > 0)
- {
- copy_pwd_changes (result, &pwd, p, plen);
- give_pwd_free (&pwd);
- /* We found the entry. */
- return NSS_STATUS_SUCCESS;
- }
- else
- {
- /* Give buffer the old len back */
- buflen += plen;
- give_pwd_free (&pwd);
- }
- return NSS_STATUS_RETURN;
+ copy_pwd_changes (result, &pwd, p, plen);
+ give_pwd_free (&pwd);
+ /* We found the entry. */
+ return NSS_STATUS_SUCCESS;
}
static enum nss_status
@@ -1000,14 +549,9 @@
ent->first = TRUE;
copy_pwd_changes (&ent->pwd, result, NULL, 0);
- if (use_nisplus)
- status = getpwent_next_nisplus_netgr (NULL, result, ent,
- &result->pw_name[2],
- buffer, buflen, errnop);
- else
- status = getpwent_next_nis_netgr (NULL, result, ent,
- &result->pw_name[2],
- buffer, buflen, errnop);
+ status = getpwent_next_nss_netgr (NULL, result, ent,
+ &result->pw_name[2],
+ buffer, buflen, errnop);
if (status == NSS_STATUS_RETURN)
continue;
else
@@ -1057,14 +601,11 @@
/* +:... */
if (result->pw_name[0] == '+' && result->pw_name[1] == '\0')
{
- ent->nis = TRUE;
+ ent->files = FALSE;
ent->first = TRUE;
copy_pwd_changes (&ent->pwd, result, NULL, 0);
- if (use_nisplus)
- return getpwent_next_nisplus (result, ent, buffer, buflen, errnop);
- else
- return getpwent_next_nis (result, ent, buffer, buflen, errnop);
+ return getpwent_next_nss (result, ent, buffer, buflen, errnop);
}
}
@@ -1082,27 +623,19 @@
/* We are searching members in a netgroup */
/* Since this is not the first call, we don't need the group name */
- if (use_nisplus)
- status = getpwent_next_nisplus_netgr (NULL, pw, ent, NULL, buffer,
- buflen, errnop);
- else
- status = getpwent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen,
- errnop);
+ status = getpwent_next_nss_netgr (NULL, pw, ent, NULL, buffer, buflen,
+ errnop);
if (status == NSS_STATUS_RETURN)
return getpwent_next_file (pw, ent, buffer, buflen, errnop);
else
return status;
}
else
- if (ent->nis)
- {
- if (use_nisplus)
- return getpwent_next_nisplus (pw, ent, buffer, buflen, errnop);
- else
- return getpwent_next_nis (pw, ent, buffer, buflen, errnop);
- }
- else
+ if (ent->files)
return getpwent_next_file (pw, ent, buffer, buflen, errnop);
+ else
+ return getpwent_next_nss (pw, ent, buffer, buflen, errnop);
+
}
enum nss_status
@@ -1114,14 +647,11 @@
__libc_lock_lock (lock);
if (ni == NULL)
- {
- __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
+ init_nss_interface ();
/* Be prepared that the setpwent function was not called before. */
if (ext_ent.stream == NULL)
- status = internal_setpwent (&ext_ent);
+ status = internal_setpwent (&ext_ent, 1);
if (status == NSS_STATUS_SUCCESS)
status = internal_getpwent_r (pwd, &ext_ent, buffer, buflen, errnop);
@@ -1269,9 +799,9 @@
_nss_compat_getpwnam_r (const char *name, struct passwd *pwd,
char *buffer, size_t buflen, int *errnop)
{
- ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
+ enum nss_status result;
+ ent_t ent = {0, 0, TRUE, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, NULL, NULL, NULL}};
- enum nss_status status;
if (name[0] == '-' || name[0] == '+')
return NSS_STATUS_NOTFOUND;
@@ -1279,32 +809,28 @@
__libc_lock_lock (lock);
if (ni == NULL)
- {
- __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
+ init_nss_interface ();
__libc_lock_unlock (lock);
- status = internal_setpwent (&ent);
- if (status != NSS_STATUS_SUCCESS)
- return status;
+ result = internal_setpwent (&ent, 1);
+
+ if (result != NSS_STATUS_SUCCESS)
+ return result;
- status = internal_getpwnam_r (name, pwd, &ent, buffer, buflen, errnop);
+ result = internal_getpwnam_r (name, pwd, &ent, buffer, buflen, errnop);
internal_endpwent (&ent);
- return status;
+ return result;
}
/* This function handle the + entry in /etc/passwd for getpwuid */
static enum nss_status
-getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer,
- size_t buflen, int *errnop)
+getpwuid_plususer (uid_t uid, struct passwd *result, ent_t *ent,
+ char *buffer, size_t buflen, int *errnop)
{
- struct parser_data *data = (void *) buffer;
struct passwd pwd;
- int parse_res;
char *p;
size_t plen;
@@ -1321,70 +847,8 @@
p = buffer + (buflen - plen);
buflen -= plen;
- if (use_nisplus) /* Do the NIS+ query here */
- {
- nis_result *res;
- char buf[1024 + pwdtablelen];
-
- snprintf (buf, sizeof (buf), "[uid=%lu],%s", (unsigned long int) uid,
- pwdtable);
- res = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
- if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
- {
- enum nss_status status = niserr2nss (res->status);
-
- nis_freeresult (res);
- return status;
- }
- if ((parse_res = _nss_nisplus_parse_pwent (res, result, buffer,
- buflen, errnop)) == -1)
- {
- nis_freeresult (res);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
- nis_freeresult (res);
- }
- else /* Use NIS */
- {
- char buf[1024];
- char *domain, *outval, *ptr;
- int outvallen;
-
- if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
- return NSS_STATUS_NOTFOUND;
-
- sprintf (buf, "%lu", (unsigned long int) uid);
- if (yp_match (domain, "passwd.byuid", buf, strlen (buf),
- &outval, &outvallen)
- != YPERR_SUCCESS)
- return NSS_STATUS_NOTFOUND;
-
- if (insert_passwd_adjunct (&outval, &outvallen, domain, errnop)
- != NSS_STATUS_SUCCESS)
- {
- free (outval);
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (buflen < ((size_t) outvallen + 1))
- {
- free (outval);
- *errnop = ERANGE;
- return NSS_STATUS_TRYAGAIN;
- }
-
- ptr = strncpy (buffer, outval, buflen);
- free (outval);
-
- while (isspace (*ptr))
- ptr++;
- parse_res = _nss_files_parse_pwent (ptr, result, data, buflen, errnop);
- if (parse_res == -1)
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (parse_res > 0)
+ if (nss_getpwuid_r (uid, result, buffer, buflen, errnop) ==
+ NSS_STATUS_SUCCESS)
{
copy_pwd_changes (result, &pwd, p, plen);
give_pwd_free (&pwd);
@@ -1400,7 +864,7 @@
return NSS_STATUS_RETURN;
}
-/* Searches in /etc/passwd and the NIS/NIS+ map for a special user id */
+/* Searches in /etc/passwd and the NSS subsystem for a special user id */
static enum nss_status
internal_getpwuid_r (uid_t uid, struct passwd *result, ent_t *ent,
char *buffer, size_t buflen, int *errnop)
@@ -1467,7 +931,8 @@
strcpy (buf, &result->pw_name[2]);
- status = getpwuid_plususer (uid, result, buffer, buflen, errnop);
+ status = getpwuid_plususer (uid, result, ent,
+ buffer, buflen, errnop);
if (status == NSS_STATUS_SUCCESS &&
innetgr (buf, NULL, result->pw_name, NULL))
return NSS_STATUS_NOTFOUND;
@@ -1484,7 +949,8 @@
strcpy (buf, &result->pw_name[2]);
- status = getpwuid_plususer (uid, result, buffer, buflen, errnop);
+ status = getpwuid_plususer (uid, result, ent,
+ buffer, buflen, errnop);
if (status == NSS_STATUS_RETURN)
continue;
@@ -1512,7 +978,8 @@
strcpy (buf, &result->pw_name[1]);
- status = getpwuid_plususer (uid, result, buffer, buflen, errnop);
+ status = getpwuid_plususer (uid, result, ent, buffer,
+ buflen, errnop);
if (status == NSS_STATUS_SUCCESS &&
innetgr (buf, NULL, result->pw_name, NULL))
return NSS_STATUS_NOTFOUND;
@@ -1528,7 +995,8 @@
strcpy (buf, &result->pw_name[1]);
- status = getpwuid_plususer (uid, result, buffer, buflen, errnop);
+ status = getpwuid_plususer (uid, result, ent, buffer,
+ buflen, errnop);
if (status == NSS_STATUS_RETURN)
continue;
@@ -1552,7 +1020,8 @@
{
enum nss_status status;
- status = getpwuid_plususer (uid, result, buffer, buflen, errnop);
+ status = getpwuid_plususer (uid, result, ent, buffer,
+ buflen, errnop);
if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
break;
else
@@ -1569,29 +1038,27 @@
_nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd,
char *buffer, size_t buflen, int *errnop)
{
- ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
- {NULL, NULL, 0, 0, NULL, NULL, NULL}};
- enum nss_status status;
+ enum nss_status result;
+ ent_t ent = {0, 0, TRUE, NULL, {NULL, 0, 0},
+ {NULL, NULL, 0, 0, NULL, NULL, NULL}};
__libc_lock_lock (lock);
if (ni == NULL)
- {
- __nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
+ init_nss_interface ();
__libc_lock_unlock (lock);
- status = internal_setpwent (&ent);
- if (status != NSS_STATUS_SUCCESS)
- return status;
+ result = internal_setpwent (&ent, 1);
+
+ if (result != NSS_STATUS_SUCCESS)
+ return result;
- status = internal_getpwuid_r (uid, pwd, &ent, buffer, buflen, errnop);
+ result = internal_getpwuid_r (uid, pwd, &ent, buffer, buflen, errnop);
internal_endpwent (&ent);
- return status;
+ return result;
}
--- nss/Versions 2003/05/20 08:48:55 1.1
+++ nss/Versions 2003/05/20 08:49:17
@@ -9,7 +9,7 @@
}
GLIBC_PRIVATE {
_nss_files_parse_grent; _nss_files_parse_pwent; _nss_files_parse_spent;
- __nss_disable_nscd;
+ __nss_disable_nscd; __nss_lookup_function;
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20030520/b6c65112/attachment.sig>
More information about the Libc-alpha
mailing list