diff options
Diffstat (limited to 'nis/nss_nisplus/nisplus-spwd.c')
| -rw-r--r-- | nis/nss_nisplus/nisplus-spwd.c | 154 |
1 files changed, 33 insertions, 121 deletions
diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c index e6ff674f30..81bde4e689 100644 --- a/nis/nss_nisplus/nisplus-spwd.c +++ b/nis/nss_nisplus/nisplus-spwd.c @@ -26,132 +26,45 @@ #include <rpcsvc/nislib.h> #include "nss-nisplus.h" +#include "nisplus-parser.h" __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) - -#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_spent (nis_result *result, struct spwd *sp, - 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 < 8) - return 0; - - if (NISENTRYLEN(0, 0, result) >= room_left) - { - /* The line is too long for our buffer. */ - no_more_room: - __set_errno (ERANGE); - return 0; - } - - strncpy (first_unused, NISENTRYVAL (0, 0, result), - NISENTRYLEN (0, 0, result)); - first_unused[NISENTRYLEN(0, 0, result)] = '\0'; - sp->sp_namp = 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'; - sp->sp_pwdp = first_unused; - room_left -= (strlen (first_unused) +1); - first_unused += strlen (first_unused) +1; - - sp->sp_lstchg = sp->sp_min = sp->sp_max = sp->sp_warn = sp->sp_inact = - sp->sp_expire = sp->sp_flag = -1; - - if (NISENTRYVAL (0, 7, result) != NULL) + if (tablename_val == NULL) { - char *line, *cp; - - line = NISENTRYVAL (0, 7, result); - cp = strchr (line, ':'); - if (cp == NULL) - return 0; - *cp++ = '\0'; - sp->sp_lstchg = atol (line); - - line = cp; - cp = strchr (line, ':'); - if (cp == NULL) - return 0; - *cp++ = '\0'; - sp->sp_min = atol(line); - - line = cp; - cp = strchr (line, ':'); - if (cp == NULL) - return 0; - *cp++ = '\0'; - sp->sp_max = atol(line); - - line = cp; - cp = strchr (line, ':'); - if (cp == NULL) - return 0; - *cp++ = '\0'; - sp->sp_warn = atol(line); - - line = cp; - cp = strchr (line, ':'); - if (cp == NULL) - return 0; - *cp++ = '\0'; - sp->sp_inact = atol(line); - - line = cp; - cp = strchr (line, ':'); - if (cp == NULL) - return 0; - *cp++ = '\0'; - sp->sp_expire = atol(line); - - line = cp; - if (line == NULL) - return 0; - sp->sp_flag = atol(line); + 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); } - - return 1; + return NSS_STATUS_SUCCESS; } enum nss_status _nss_nisplus_setspent (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); @@ -166,11 +79,6 @@ _nss_nisplus_endspent (void) if (result) nis_freeresult (result); result = NULL; - if (names) - { - nis_freenames (names); - names = NULL; - } __libc_lock_unlock (lock); @@ -187,11 +95,11 @@ internal_nisplus_getspent_r (struct spwd *sp, 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); } @@ -199,7 +107,7 @@ internal_nisplus_getspent_r (struct spwd *sp, 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) @@ -232,16 +140,20 @@ _nss_nisplus_getspnam_r (const char *name, struct spwd *sp, { 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) { |