summaryrefslogtreecommitdiff
path: root/nis/nss_compat
diff options
context:
space:
mode:
Diffstat (limited to 'nis/nss_compat')
-rw-r--r--nis/nss_compat/compat-grp.c120
-rw-r--r--nis/nss_compat/compat-pwd.c81
-rw-r--r--nis/nss_compat/compat-spwd.c78
3 files changed, 102 insertions, 177 deletions
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index 40a190eea7..59165ea590 100644
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -30,9 +30,12 @@
#include <nsswitch.h>
#include "nss-nisplus.h"
+#include "nisplus-parser.h"
static service_user *ni = NULL;
static bool_t use_nisplus = FALSE; /* default: group_compat: nis */
+static nis_name grptable = NULL; /* Name of the group table */
+static size_t grptablelen = 0;
/* Get the declaration of the parser function. */
#define ENTNAME grent
@@ -57,14 +60,12 @@ struct ent_t
char *oldkey;
int oldkeylen;
nis_result *result;
- nis_name *names;
- u_long names_nr;
FILE *stream;
struct blacklist_t blacklist;
};
typedef struct ent_t ent_t;
-static ent_t ext_ent = {0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0}};
+static ent_t ext_ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
/* Protect global state against multiple changers. */
__libc_lock_define_initialized (static, lock)
@@ -72,8 +73,31 @@ __libc_lock_define_initialized (static, lock)
/* Prototypes for local functions. */
static void blacklist_store_name (const char *, ent_t *);
static int in_blacklist (const char *, int, ent_t *);
-extern int _nss_nisplus_parse_grent (nis_result *, struct group *,
- char *, size_t);
+
+static enum nss_status
+_nss_first_init (void)
+{
+ if (ni == NULL)
+ {
+ __nss_database_lookup ("group_compat", NULL, "nis", &ni);
+ use_nisplus = (strcmp (ni->name, "nisplus") == 0);
+ }
+
+ if (grptable == NULL)
+ {
+ char buf [20 + strlen (nis_local_directory ())];
+ char *p;
+
+ p = stpcpy (buf, "group.org_dir.");
+ p = stpcpy (p, nis_local_directory ());
+ grptable = strdup (buf);
+ if (grptable == NULL)
+ return NSS_STATUS_TRYAGAIN;
+ grptablelen = strlen (grptable);
+ }
+
+ return NSS_STATUS_SUCCESS;
+}
static enum nss_status
internal_setgrent (ent_t *ent)
@@ -82,6 +106,9 @@ internal_setgrent (ent_t *ent)
ent->nis = ent->nis_first = 0;
+ if (_nss_first_init () != NSS_STATUS_SUCCESS)
+ return NSS_STATUS_UNAVAIL;
+
if (ent->oldkey != NULL)
{
free (ent->oldkey);
@@ -95,12 +122,6 @@ internal_setgrent (ent_t *ent)
ent->result = NULL;
}
- if (ent->names != NULL)
- {
- nis_freenames (ent->names);
- ent->names = NULL;
- }
- ent->names_nr = 0;
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
ent->blacklist.data[0] = '\0';
@@ -126,12 +147,6 @@ _nss_compat_setgrent (void)
__libc_lock_lock (lock);
- if (ni == NULL)
- {
- __nss_database_lookup ("group_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
-
result = internal_setgrent (&ext_ent);
__libc_lock_unlock (lock);
@@ -164,12 +179,6 @@ internal_endgrent (ent_t *ent)
ent->result = NULL;
}
- if (ent->names != NULL)
- {
- nis_freenames (ent->names);
- ent->names = NULL;
- }
- ent->names_nr = 0;
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
ent->blacklist.data[0] = '\0';
@@ -263,22 +272,11 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
{
int parse_res;
- if (ent->names == NULL)
- {
- ent->names = nis_getnames ("group.org_dir");
- if (ent->names == NULL || ent->names[0] == NULL)
- {
- ent->nis = 0;
- return NSS_STATUS_UNAVAIL;
- }
- }
-
do
{
if (ent->nis_first)
{
- next_name:
- ent->result = nis_first_entry(ent->names[ent->names_nr]);
+ ent->result = nis_first_entry(grptable);
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
{
ent->nis = 0;
@@ -290,27 +288,16 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
{
nis_result *res;
- res = nis_next_entry(ent->names[ent->names_nr],
- &ent->result->cookie);
+ res = nis_next_entry(grptable, &ent->result->cookie);
nis_freeresult (ent->result);
ent->result = res;
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
{
- if ((ent->result->status == NIS_NOTFOUND) &&
- ent->names[ent->names_nr + 1] != NULL)
- {
- nis_freeresult (ent->result);
- ent->names_nr += 1;
- goto next_name;
- }
- else
- {
- ent->nis = 0;
- return niserr2nss (ent->result->status);
- }
+ ent->nis = 0;
+ return niserr2nss (ent->result->status);
}
}
- parse_res = _nss_nisplus_parse_grent (ent->result, result, buffer,
+ parse_res = _nss_nisplus_parse_grent (ent->result, 0, result, buffer,
buflen);
if (parse_res &&
in_blacklist (result->gr_name, strlen (result->gr_name), ent))
@@ -332,11 +319,10 @@ getgrent_next_file_plusgroup (struct group *result, char *buffer,
if (use_nisplus) /* Do the NIS+ query here */
{
nis_result *res;
- char buf[strlen (result->gr_name) + 24];
+ char buf[strlen (result->gr_name) + 24 + grptablelen];
- sprintf(buf, "[name=%s],group.org_dir",
- &result->gr_name[1]);
- res = nis_list(buf, EXPAND_NAME, NULL, NULL);
+ sprintf(buf, "[name=%s],%s", &result->gr_name[1], grptable);
+ res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
{
enum nss_status status = niserr2nss (res->status);
@@ -344,7 +330,7 @@ getgrent_next_file_plusgroup (struct group *result, char *buffer,
nis_freeresult (res);
return status;
}
- parse_res = _nss_nisplus_parse_grent (res, result, buffer, buflen);
+ parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer, buflen);
nis_freeresult (res);
}
else /* Use NIS */
@@ -470,12 +456,6 @@ _nss_compat_getgrent_r (struct group *grp, char *buffer, size_t buflen)
__libc_lock_lock (lock);
- if (ni == NULL)
- {
- __nss_database_lookup ("group_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
-
/* Be prepared that the setgrent function was not called before. */
if (ext_ent.stream == NULL)
status = internal_setgrent (&ext_ent);
@@ -493,7 +473,7 @@ enum nss_status
_nss_compat_getgrnam_r (const char *name, struct group *grp,
char *buffer, size_t buflen)
{
- ent_t ent = {0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0}};
+ ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
enum nss_status status;
if (name[0] == '-' || name[0] == '+')
@@ -501,15 +481,10 @@ _nss_compat_getgrnam_r (const char *name, struct group *grp,
__libc_lock_lock (lock);
- if (ni == NULL)
- {
- __nss_database_lookup ("group_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
+ status = internal_setgrent (&ent);
__libc_lock_unlock (lock);
- status = internal_setgrent (&ent);
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -527,20 +502,15 @@ enum nss_status
_nss_compat_getgrgid_r (gid_t gid, struct group *grp,
char *buffer, size_t buflen)
{
- ent_t ent = {0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0}};
+ ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
enum nss_status status;
__libc_lock_lock (lock);
- if (ni == NULL)
- {
- __nss_database_lookup ("group_compat", NULL, "nis", &ni);
- use_nisplus = (strcmp (ni->name, "nisplus") == 0);
- }
+ status = internal_setgrent (&ent);
__libc_lock_unlock (lock);
- status = internal_setgrent (&ent);
if (status != NSS_STATUS_SUCCESS)
return status;
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index d0d230bb1e..0d0f2a6c33 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -32,9 +32,12 @@
#include "netgroup.h"
#include "nss-nisplus.h"
+#include "nisplus-parser.h"
static service_user *ni = NULL;
static bool_t use_nisplus = FALSE; /* default: passwd_compat: nis */
+static nis_name pwdtable = NULL; /* Name of the pwd table */
+static size_t pwdtablelen = 0;
/* Get the declaration of the parser function. */
#define ENTNAME pwent
@@ -60,8 +63,6 @@ struct ent_t
char *oldkey;
int oldkeylen;
nis_result *result;
- nis_name *names;
- u_long names_nr;
FILE *stream;
struct blacklist_t blacklist;
struct passwd pwd;
@@ -69,7 +70,7 @@ struct ent_t
};
typedef struct ent_t ent_t;
-static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0},
+static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, NULL, NULL, NULL}};
/* Protect global state against multiple changers. */
@@ -78,8 +79,7 @@ __libc_lock_define_initialized (static, lock)
/* Prototypes for local functions. */
static void blacklist_store_name (const char *, ent_t *);
static int in_blacklist (const char *, int, ent_t *);
-extern int _nss_nisplus_parse_pwent (nis_result *, struct passwd *,
- char *, size_t);
+
static void
give_pwd_free (struct passwd *pwd)
{
@@ -209,12 +209,19 @@ internal_setpwent (ent_t *ent)
ent->result = NULL;
}
- if (ent->names != NULL)
+ if (pwdtable == NULL)
{
- nis_freenames (ent->names);
- ent->names = NULL;
+ char buf [20 + strlen (nis_local_directory ())];
+ char *p;
+
+ p = stpcpy (buf, "passwd.org_dir.");
+ p = stpcpy (p, nis_local_directory ());
+ pwdtable = strdup (buf);
+ if (pwdtable == NULL)
+ return NSS_STATUS_TRYAGAIN;
+ pwdtablelen = strlen (pwdtable);
}
- ent->names_nr = 0;
+
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
ent->blacklist.data[0] = '\0';
@@ -280,13 +287,6 @@ internal_endpwent (ent_t *ent)
ent->result = NULL;
}
- if (ent->names != NULL)
- {
- nis_freenames (ent->names);
- ent->names = NULL;
- }
- ent->names_nr = 0;
-
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
ent->blacklist.data[0] = '\0';
@@ -435,9 +435,9 @@ 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);
+ 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)
{
@@ -475,16 +475,6 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
size_t p2len;
char *p2;
- if (ent->names == NULL)
- {
- ent->names = nis_getnames ("passwd.org_dir");
- if (ent->names == NULL || ent->names[0] == NULL)
- {
- ent->nis = 0;
- return NSS_STATUS_UNAVAIL;
- }
- }
-
p2len = pwd_need_buflen (&ent->pwd);
if (p2len > buflen)
{
@@ -497,8 +487,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
{
if (ent->first)
{
- next_name:
- ent->result = nis_first_entry(ent->names[ent->names_nr]);
+ ent->result = nis_first_entry(pwdtable);
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
{
ent->nis = 0;
@@ -511,25 +500,14 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
{
nis_result *res;
- res = nis_next_entry(ent->names[ent->names_nr],
- &ent->result->cookie);
+ res = nis_next_entry(pwdtable, &ent->result->cookie);
nis_freeresult (ent->result);
ent->result = res;
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
{
- if ((ent->result->status == NIS_NOTFOUND) &&
- ent->names[ent->names_nr + 1] != NULL)
- {
- nis_freeresult (ent->result);
- ent->names_nr += 1;
- goto next_name;
- }
- else
- {
- ent->nis = 0;
- give_pwd_free (&ent->pwd);
- return niserr2nss (ent->result->status);
- }
+ ent->nis = 0;
+ give_pwd_free (&ent->pwd);
+ return niserr2nss (ent->result->status);
}
}
parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer,
@@ -648,11 +626,10 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer,
if (use_nisplus) /* Do the NIS+ query here */
{
nis_result *res;
- char buf[strlen (result->pw_name) + 24];
+ char buf[strlen (result->pw_name) + 24 + pwdtablelen];
- sprintf(buf, "[name=%s],passwd.org_dir",
- &result->pw_name[1]);
- res = nis_list(buf, EXPAND_NAME, NULL, NULL);
+ sprintf(buf, "[name=%s],%s", &result->pw_name[1], 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);
@@ -869,7 +846,7 @@ enum nss_status
_nss_compat_getpwnam_r (const char *name, struct passwd *pwd,
char *buffer, size_t buflen)
{
- ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0},
+ ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, NULL, NULL, NULL}};
enum nss_status status;
@@ -904,7 +881,7 @@ enum nss_status
_nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd,
char *buffer, size_t buflen)
{
- ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0},
+ ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, NULL, NULL, NULL}};
enum nss_status status;
diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c
index 066f707ebb..4199baf202 100644
--- a/nis/nss_compat/compat-spwd.c
+++ b/nis/nss_compat/compat-spwd.c
@@ -32,9 +32,12 @@
#include "netgroup.h"
#include "nss-nisplus.h"
+#include "nisplus-parser.h"
static service_user *ni = NULL;
static bool_t use_nisplus = FALSE; /* default: passwd_compat: nis */
+static nis_name pwdtable = NULL; /* Name of the password table */
+static size_t pwdtablelen = 0;
/* Get the declaration of the parser function. */
#define ENTNAME spent
@@ -60,8 +63,6 @@ struct ent_t
char *oldkey;
int oldkeylen;
nis_result *result;
- nis_name *names;
- u_long names_nr;
FILE *stream;
struct blacklist_t blacklist;
struct spwd pwd;
@@ -69,7 +70,7 @@ struct ent_t
};
typedef struct ent_t ent_t;
-static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0},
+static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, 0, 0, 0, 0, 0}};
/* Protect global state against multiple changers. */
@@ -78,8 +79,7 @@ __libc_lock_define_initialized (static, lock)
/* Prototypes for local functions. */
static void blacklist_store_name (const char *, ent_t *);
static int in_blacklist (const char *, int, ent_t *);
-extern int _nss_nisplus_parse_spent (nis_result *, struct spwd *,
- char *, size_t);
+
static void
give_spwd_free (struct spwd *pwd)
{
@@ -160,12 +160,19 @@ internal_setspent (ent_t *ent)
nis_freeresult (ent->result);
ent->result = NULL;
}
- if (ent->names != NULL)
+
+ if (pwdtable == NULL)
{
- nis_freenames (ent->names);
- ent->names = NULL;
+ char buf [20 + strlen (nis_local_directory ())];
+ char *p;
+
+ p = stpcpy (buf, "passwd.org_dir.");
+ p = stpcpy (p, nis_local_directory ());
+ pwdtable = strdup (buf);
+ if (pwdtable == NULL)
+ return NSS_STATUS_TRYAGAIN;
+ pwdtablelen = strlen (pwdtable);
}
- ent->names_nr = 0;
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
@@ -234,12 +241,6 @@ internal_endspent (ent_t *ent)
nis_freeresult (ent->result);
ent->result = NULL;
}
- if (ent->names != NULL)
- {
- nis_freenames (ent->names);
- ent->names = NULL;
- }
- ent->names_nr = 0;
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
@@ -387,9 +388,9 @@ getspent_next_nisplus_netgr (struct spwd *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);
+ char buf[strlen (user) + 30 + pwdtablelen];
+ sprintf(buf, "[name=%s],%s", user, pwdtable);
+ nisres = nis_list(buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
}
if (niserr2nss (nisres->status) != NSS_STATUS_SUCCESS)
{
@@ -427,16 +428,6 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
size_t p2len;
char *p2;
- if (ent->names == NULL)
- {
- ent->names = nis_getnames ("passwd.org_dir");
- if (ent->names == NULL || ent->names[0] == NULL)
- {
- ent->nis = 0;
- return NSS_STATUS_UNAVAIL;
- }
- }
-
p2len = spwd_need_buflen (&ent->pwd);
if (p2len > buflen)
{
@@ -449,8 +440,7 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
{
if (ent->first)
{
- next_name:
- ent->result = nis_first_entry(ent->names[ent->names_nr]);
+ ent->result = nis_first_entry(pwdtable);
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
{
ent->nis = 0;
@@ -463,25 +453,14 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
{
nis_result *res;
- res = nis_next_entry(ent->names[ent->names_nr],
- &ent->result->cookie);
+ res = nis_next_entry(pwdtable, &ent->result->cookie);
nis_freeresult (ent->result);
ent->result = res;
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
{
- if ((ent->result->status == NIS_NOTFOUND) &&
- ent->names[ent->names_nr + 1] != NULL)
- {
- nis_freeresult (ent->result);
- ent->names_nr += 1;
- goto next_name;
- }
- else
- {
- ent->nis = 0;
- give_spwd_free (&ent->pwd);
- return niserr2nss (ent->result->status);
- }
+ ent->nis = 0;
+ give_spwd_free (&ent->pwd);
+ return niserr2nss (ent->result->status);
}
}
parse_res = _nss_nisplus_parse_spent (ent->result, result, buffer,
@@ -601,11 +580,10 @@ getspent_next_file_plususer (struct spwd *result, char *buffer,
if (use_nisplus) /* Do the NIS+ query here */
{
nis_result *res;
- char buf[strlen (result->sp_namp) + 24];
+ char buf[strlen (result->sp_namp) + 24 + pwdtablelen];
- sprintf(buf, "[name=%s],passwd.org_dir",
- &result->sp_namp[1]);
- res = nis_list(buf, EXPAND_NAME, NULL, NULL);
+ sprintf(buf, "[name=%s],%s", &result->sp_namp[1], pwdtable);
+ res = nis_list(buf, 0, NULL, NULL);
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
{
enum nss_status status = niserr2nss (res->status);
@@ -821,7 +799,7 @@ enum nss_status
_nss_compat_getspnam_r (const char *name, struct spwd *pwd,
char *buffer, size_t buflen)
{
- ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0},
+ ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, 0, 0, 0, 0, 0}};
enum nss_status status;