aboutsummaryrefslogtreecommitdiff
path: root/nis/nss_nisplus/nisplus-pwd.c
diff options
context:
space:
mode:
Diffstat (limited to 'nis/nss_nisplus/nisplus-pwd.c')
-rw-r--r--nis/nss_nisplus/nisplus-pwd.c197
1 files changed, 61 insertions, 136 deletions
diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c
index 89b0eff7a7..459a1a4380 100644
--- a/nis/nss_nisplus/nisplus-pwd.c
+++ b/nis/nss_nisplus/nisplus-pwd.c
@@ -30,127 +30,48 @@
__libc_lock_define_initialized (static, lock)
static nis_result *result = NULL;
-static nis_name *names = NULL;
+static nis_name tablename_val = NULL;
+static u_long tablename_len = 0;
-#define NISENTRYVAL(idx,col,res) \
- ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val)
+extern int _nss_nisplus_parse_pwent (nis_result *res, struct passwd *pw,
+ char *buffer, size_t buflen);
-#define NISENTRYLEN(idx,col,res) \
- ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
-
-int
-_nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw,
- char *buffer, size_t buflen)
+static enum nss_status
+_nss_create_tablename (void)
{
- char *first_unused = buffer;
- size_t room_left = buflen;
-
- if (result == NULL)
- return 0;
-
- if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) ||
- result->objects.objects_len != 1 ||
- result->objects.objects_val[0].zo_data.zo_type != ENTRY_OBJ ||
- strcmp(result->objects.objects_val[0].zo_data.objdata_u.en_data.en_type,
- "passwd_tbl") != 0 ||
- result->objects.objects_val[0].zo_data.objdata_u.en_data.en_cols.en_cols_len < 7)
- return 0;
-
- if (NISENTRYLEN(0, 0, result) >= room_left)
+ if (tablename_val == NULL)
{
- /* The line is too long for our buffer. */
- no_more_room:
- __set_errno (ERANGE);
- return 0;
+ char buf [40 + strlen (nis_local_directory ())];
+ char *p;
+
+ p = stpcpy (buf, "passwd.org_dir.");
+ p = stpcpy (p, nis_local_directory ());
+ tablename_val = strdup (buf);
+ if (tablename_val == NULL)
+ return NSS_STATUS_TRYAGAIN;
+ tablename_len = strlen (tablename_val);
}
-
- strncpy (first_unused, NISENTRYVAL(0, 0, result),
- NISENTRYLEN (0, 0, result));
- first_unused[NISENTRYLEN(0, 0, result)] = '\0';
- pw->pw_name = first_unused;
- room_left -= (strlen (first_unused) +1);
- first_unused += strlen (first_unused) +1;
-
- if (NISENTRYLEN(0, 1, result) >= room_left)
- goto no_more_room;
-
- strncpy (first_unused, NISENTRYVAL(0, 1, result),
- NISENTRYLEN (0, 1, result));
- first_unused[NISENTRYLEN(0, 1, result)] = '\0';
- pw->pw_passwd = first_unused;
- room_left -= (strlen (first_unused) +1);
- first_unused += strlen (first_unused) +1;
-
- if (NISENTRYLEN(0, 2, result) >= room_left)
- goto no_more_room;
-
- strncpy (first_unused, NISENTRYVAL (0, 2, result),
- NISENTRYLEN (0, 2, result));
- first_unused[NISENTRYLEN(0, 2, result)] = '\0';
- pw->pw_uid = atoi (first_unused);
- room_left -= (strlen (first_unused) +1);
- first_unused += strlen (first_unused) +1;
-
- if (NISENTRYLEN(0, 3, result) >= room_left)
- goto no_more_room;
-
- strncpy (first_unused, NISENTRYVAL(0, 3, result),
- NISENTRYLEN (0, 3, result));
- first_unused[NISENTRYLEN(0, 3, result)] = '\0';
- pw->pw_gid = atoi (first_unused);
- room_left -= (strlen (first_unused) +1);
- first_unused += strlen (first_unused) +1;
-
- if (NISENTRYLEN(0, 4, result) >= room_left)
- goto no_more_room;
-
- strncpy (first_unused, NISENTRYVAL(0, 4, result),
- NISENTRYLEN (0, 4, result));
- first_unused[NISENTRYLEN(0, 4, result)] = '\0';
- pw->pw_gecos = first_unused;
- room_left -= (strlen (first_unused) +1);
- first_unused += strlen (first_unused) +1;
-
- if (NISENTRYLEN(0, 5, result) >= room_left)
- goto no_more_room;
-
- strncpy (first_unused, NISENTRYVAL (0, 5, result),
- NISENTRYLEN (0, 5, result));
- first_unused[NISENTRYLEN(0, 5, result)] = '\0';
- pw->pw_dir = first_unused;
- room_left -= (strlen (first_unused) +1);
- first_unused += strlen (first_unused) +1;
-
- if (NISENTRYLEN(0, 6, result) >= room_left)
- goto no_more_room;
-
- strncpy (first_unused, NISENTRYVAL (0, 6, result),
- NISENTRYLEN (0, 6, result));
- first_unused[NISENTRYLEN (0, 6, result)] = '\0';
- pw->pw_shell = first_unused;
- room_left -= (strlen (first_unused) +1);
- first_unused += strlen (first_unused) +1;
-
- return 1;
+ return NSS_STATUS_SUCCESS;
}
+
enum nss_status
_nss_nisplus_setpwent (void)
{
+ enum nss_status status = NSS_STATUS_SUCCESS;
+
__libc_lock_lock (lock);
if (result)
nis_freeresult (result);
result = NULL;
- if (names)
- {
- nis_freenames (names);
- names = NULL;
- }
+
+ if (tablename_val == NULL)
+ status = _nss_create_tablename ();
__libc_lock_unlock (lock);
- return NSS_STATUS_SUCCESS;
+ return status;
}
enum nss_status
@@ -161,11 +82,6 @@ _nss_nisplus_endpwent (void)
if (result)
nis_freeresult (result);
result = NULL;
- if (names)
- {
- nis_freenames (names);
- names = NULL;
- }
__libc_lock_unlock (lock);
@@ -182,11 +98,11 @@ internal_nisplus_getpwent_r (struct passwd *pw, char *buffer, size_t buflen)
{
if (result == NULL)
{
- names = nis_getnames ("passwd.org_dir");
- if (names == NULL || names[0] == NULL)
- return NSS_STATUS_UNAVAIL;
+ if (tablename_val == NULL)
+ if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+ return NSS_STATUS_UNAVAIL;
- result = nis_first_entry(names[0]);
+ result = nis_first_entry(tablename_val);
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
return niserr2nss (result->status);
}
@@ -194,7 +110,7 @@ internal_nisplus_getpwent_r (struct passwd *pw, char *buffer, size_t buflen)
{
nis_result *res;
- res = nis_next_entry(names[0], &result->cookie);
+ res = nis_next_entry(tablename_val, &result->cookie);
nis_freeresult (result);
result = res;
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
@@ -227,16 +143,20 @@ _nss_nisplus_getpwnam_r (const char *name, struct passwd *pw,
{
int parse_res;
+ if (tablename_val == NULL)
+ if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+ return NSS_STATUS_UNAVAIL;
+
if (name == NULL || strlen (name) > 8)
return NSS_STATUS_NOTFOUND;
else
{
nis_result *result;
- char buf[strlen (name) + 24];
+ char buf[strlen (name) + 24 + tablename_len];
- sprintf(buf, "[name=%s],passwd.org_dir", name);
+ sprintf(buf, "[name=%s],%s", name, tablename_val);
- result = nis_list(buf, EXPAND_NAME, NULL, NULL);
+ result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
{
@@ -264,30 +184,35 @@ enum nss_status
_nss_nisplus_getpwuid_r (const uid_t uid, struct passwd *pw,
char *buffer, size_t buflen)
{
- int parse_res;
- nis_result *result;
- char buf[100];
-
- sprintf(buf, "[uid=%d],passwd.org_dir", uid);
+ if (tablename_val == NULL)
+ if (_nss_create_tablename () != NSS_STATUS_SUCCESS)
+ return NSS_STATUS_UNAVAIL;
+ {
+ int parse_res;
+ nis_result *result;
+ char buf[100 + tablename_len];
- result = nis_list(buf, EXPAND_NAME, NULL, NULL);
+ sprintf(buf, "[uid=%d],%s", uid, tablename_val);
- if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
- {
- enum nss_status status = niserr2nss (result->status);
+ result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
- nis_freeresult (result);
- return status;
- }
+ if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
+ {
+ enum nss_status status = niserr2nss (result->status);
- parse_res = _nss_nisplus_parse_pwent (result, pw, buffer, buflen);
+ nis_freeresult (result);
+ return status;
+ }
- nis_freeresult (result);
- if (parse_res)
- return NSS_STATUS_SUCCESS;
+ parse_res = _nss_nisplus_parse_pwent (result, pw, buffer, buflen);
- if (!parse_res && errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
- else
- return NSS_STATUS_NOTFOUND;
+ nis_freeresult (result);
+ if (parse_res)
+ return NSS_STATUS_SUCCESS;
+
+ if (!parse_res && errno == ERANGE)
+ return NSS_STATUS_TRYAGAIN;
+ else
+ return NSS_STATUS_NOTFOUND;
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:46:25 +0000