aboutsummaryrefslogtreecommitdiff
path: root/nis/nss_compat/compat-pwd.c
diff options
context:
space:
mode:
Diffstat (limited to 'nis/nss_compat/compat-pwd.c')
-rw-r--r--nis/nss_compat/compat-pwd.c74
1 files changed, 41 insertions, 33 deletions
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 317e2d1..1a80355 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -321,7 +321,7 @@ getpwent_next_nis_netgr (struct passwd *result, ent_t *ent, char *group,
char *ypdomain, *host, *user, *domain, *outval, *p, *p2;
int status, outvallen;
size_t p2len;
-
+
if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
{
ent->netgroup = 0;
@@ -390,8 +390,8 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group,
int status, parse_res;
size_t p2len;
nis_result *nisres;
-
- /* Maybe we should use domainname here ? We need the current
+
+ /* 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)
{
@@ -434,7 +434,7 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group,
}
p2 = buffer + (buflen - p2len);
buflen -= p2len;
- {
+ {
char buf[strlen (user) + 30];
sprintf(buf, "[name=%s],passwd.org_dir", user);
nisres = nis_list(buf, EXPAND_NAME, NULL, NULL);
@@ -446,7 +446,7 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group,
}
parse_res = _nss_nisplus_parse_pwent (nisres, result, buffer, buflen);
nis_freeresult (nisres);
-
+
if (parse_res)
{
copy_pwd_changes (result, &ent->pwd, p2, p2len);
@@ -484,7 +484,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
return NSS_STATUS_UNAVAIL;
}
}
-
+
p2len = pwd_need_buflen (&ent->pwd);
if (p2len > buflen)
{
@@ -510,8 +510,8 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
else
{
nis_result *res;
-
- res = nis_next_entry(ent->names[ent->names_nr],
+
+ res = nis_next_entry(ent->names[ent->names_nr],
&ent->result->cookie);
nis_freeresult (ent->result);
ent->result = res;
@@ -532,16 +532,16 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
}
}
}
- parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer,
+ parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer,
buflen);
- if (parse_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;
}
@@ -623,7 +623,7 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer,
/* This function handle the +user entrys in /etc/passwd */
static enum nss_status
-getpwent_next_file_plususer (struct passwd *result, char *buffer,
+getpwent_next_file_plususer (struct passwd *result, char *buffer,
size_t buflen)
{
struct parser_data *data = (void *) buffer;
@@ -631,11 +631,11 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer,
int parse_res;
char *p;
size_t plen;
-
+
memset (&pwd, '\0', sizeof (struct passwd));
-
+
copy_pwd_changes (&pwd, result, NULL, 0);
-
+
plen = pwd_need_buflen (&pwd);
if (plen > buflen)
{
@@ -644,19 +644,19 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer,
}
p = buffer + (buflen - plen);
buflen -= plen;
-
+
if (use_nisplus) /* Do the NIS+ query here */
{
nis_result *res;
char buf[strlen (result->pw_name) + 24];
-
+
sprintf(buf, "[name=%s],passwd.org_dir",
&result->pw_name[1]);
res = nis_list(buf, EXPAND_NAME, NULL, NULL);
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
{
enum nss_status status = niserr2nss (res->status);
-
+
nis_freeresult (res);
return status;
}
@@ -668,22 +668,22 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer,
char *domain;
char *outval;
int outvallen;
-
+
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
return NSS_STATUS_TRYAGAIN;
-
+
if (yp_match (domain, "passwd.byname", &result->pw_name[1],
strlen (result->pw_name) - 1, &outval, &outvallen)
!= YPERR_SUCCESS)
return NSS_STATUS_TRYAGAIN;
- p = strncpy (buffer, outval,
+ p = strncpy (buffer, outval,
buflen < outvallen ? buflen : outvallen);
free (outval);
while (isspace (*p))
p++;
parse_res = _nss_files_parse_pwent (p, result, data, buflen);
}
-
+
if (parse_res)
{
copy_pwd_changes (result, &pwd, p, plen);
@@ -735,15 +735,19 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
if (result->pw_name[0] == '-' && result->pw_name[1] == '@'
&& result->pw_name[2] != '\0')
{
+ char buf2[1024];
char *user, *host, *domain;
+ struct __netgrent netgrdata;
- setnetgrent (&result->pw_name[2]);
- while (getnetgrent (&host, &user, &domain))
+ bzero (&netgrdata, sizeof (struct __netgrent));
+ __internal_setnetgrent (&result->pw_name[2], &netgrdata);
+ while (__internal_getnetgrent_r (&host, &user, &domain,
+ &netgrdata, buf2, sizeof (buf2)))
{
if (user != NULL && user[0] != '-')
blacklist_store_name (user, ent);
}
- endnetgrent ();
+ __internal_endnetgrent (&netgrdata);
continue;
}
@@ -778,7 +782,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
&& result->pw_name[1] != '@')
{
enum nss_status status;
-
+
status = getpwent_next_file_plususer (result, buffer, buflen);
if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
break;
@@ -879,7 +883,7 @@ _nss_compat_getpwnam_r (const char *name, struct passwd *pwd,
__nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
__libc_lock_unlock (lock);
status = internal_setpwent (&ent);
@@ -903,17 +907,17 @@ _nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd,
ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, NULL, NULL, NULL}};
enum nss_status status;
-
+
__libc_lock_lock (lock);
-
+
if (ni == NULL)
{
__nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
__libc_lock_unlock (lock);
-
+
status = internal_setpwent (&ent);
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -979,10 +983,14 @@ static bool_t
in_blacklist (const char *name, int namelen, ent_t *ent)
{
char buf[namelen + 3];
+ char *cp;
if (ent->blacklist.data == NULL)
return FALSE;
- stpcpy (stpcpy (stpcpy (buf, "|"), name), "|");
+ buf[0] = '|';
+ cp = stpcpy (&buf[1], name);
+ *cp++= '|';
+ *cp = '\0';
return strstr (ent->blacklist.data, buf) != NULL;
}
generated by cgit v1.1 at 2024-12-27 05:05:28 +0000