Skip to content

Commit

Permalink
2006-10-06 Ulrich Drepper <drepper@redhat.com>
Browse files Browse the repository at this point in the history
	* nis/nis_table.c (nis_list): If __follow_path fails in the new
	code, make sure the nis_freeresult call doesn't crash and that the
	result is reported correctly.

2006-09-27  Jakub Jelinek  <jakub@redhat.com>

	* nis/nis_table.c (nis_list): Handle FOLLOW_PATH | ALL_RESULTS
	when callback is NULL.

	* nis/Versions (libnss_nisplus): Add
	_nss_nisplus_initgroups_dyn@@GLIBC_PRIVATE.
	* nis/Makefile (libnss_nisplus-routines): Add nisplus-initgroups.
	* nis/nss_nisplus/nisplus-grp.c (tablename_val, tablename_len,
	_nss_create_tablename): Rename to...
	(grp_tablename_val, grp_tablename_len, _nss_grp_create_tablename):
	... these.  No longer static.
	(internal_setgrent): Adjust users.
	(_nss_nisplus_getgrnam_r, _nss_nisplus_getgrgid_r): Likewise.
	Don't use locking around _nss_grp_create_tablename call.
	* nis/nss_nisplus/nisplus-initgroups.c: New file.
  • Loading branch information
Jakub Jelinek committed Oct 8, 2006
1 parent 70c9744 commit 59b0795
Showing 5 changed files with 109 additions and 29 deletions.
23 changes: 23 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
2006-10-06 Ulrich Drepper <drepper@redhat.com>

* nis/nis_table.c (nis_list): If __follow_path fails in the new
code, make sure the nis_freeresult call doesn't crash and that the
result is reported correctly.

2006-09-27 Jakub Jelinek <jakub@redhat.com>

* nis/nis_table.c (nis_list): Handle FOLLOW_PATH | ALL_RESULTS
when callback is NULL.

* nis/Versions (libnss_nisplus): Add
_nss_nisplus_initgroups_dyn@@GLIBC_PRIVATE.
* nis/Makefile (libnss_nisplus-routines): Add nisplus-initgroups.
* nis/nss_nisplus/nisplus-grp.c (tablename_val, tablename_len,
_nss_create_tablename): Rename to...
(grp_tablename_val, grp_tablename_len, _nss_grp_create_tablename):
... these. No longer static.
(internal_setgrent): Adjust users.
(_nss_nisplus_getgrnam_r, _nss_nisplus_getgrgid_r): Likewise.
Don't use locking around _nss_grp_create_tablename call.
* nis/nss_nisplus/nisplus-initgroups.c: New file.

2006-10-06 Andreas Jaeger <aj@suse.de>

* include/features.h (__GLIBC_MINOR__): It's glibc 2.5 now.
2 changes: 1 addition & 1 deletion nis/Makefile
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ libnss_nis-routines := $(addprefix nis-,$(databases)) nis-initgroups \
libnss_nis-inhibit-o = $(filter-out .os,$(object-suffixes))

libnss_nisplus-routines := $(addprefix nisplus-,$(databases)) nisplus-parser \
nss-nisplus
nss-nisplus nisplus-initgroups
libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))

include ../Rules
2 changes: 1 addition & 1 deletion nis/Versions
Original file line number Diff line number Diff line change
@@ -125,6 +125,6 @@ libnss_nisplus {
_nss_nisplus_setetherent; _nss_nisplus_setgrent; _nss_nisplus_sethostent;
_nss_nisplus_setnetent; _nss_nisplus_setnetgrent; _nss_nisplus_setprotoent;
_nss_nisplus_setpwent; _nss_nisplus_setrpcent; _nss_nisplus_setservent;
_nss_nisplus_setspent;
_nss_nisplus_setspent; _nss_nisplus_initgroups_dyn;
}
}
60 changes: 60 additions & 0 deletions nis/nis_table.c
Original file line number Diff line number Diff line change
@@ -215,6 +215,7 @@ nis_list (const_nis_name name, unsigned int flags,
char *tableptr;
char *tablepath = NULL;
int first_try = 0; /* Do we try the old binding at first ? */
nis_result *allres = NULL;

if (res == NULL)
return NULL;
@@ -223,6 +224,7 @@ nis_list (const_nis_name name, unsigned int flags,
{
status = NIS_BADNAME;
err_out:
nis_freeresult (allres);
memset (res, '\0', sizeof (nis_result));
NIS_RES_STATUS (res) = status;
return res;
@@ -349,6 +351,7 @@ nis_list (const_nis_name name, unsigned int flags,
if (names != namebuf)
nis_freenames (names);
nis_free_request (ibreq);
nis_freeresult (allres);
return res;
}
if (NIS_RES_OBJECT (res)->LI_data.li_attrs.li_attrs_len)
@@ -392,6 +395,57 @@ nis_list (const_nis_name name, unsigned int flags,
goto again;
}
}
else if ((flags & (FOLLOW_PATH | ALL_RESULTS))
== (FOLLOW_PATH | ALL_RESULTS))
{
if (allres == NULL)
{
allres = res;
res = malloc (sizeof (nis_result));
if (res == NULL)
{
res = allres;
allres = NULL;
NIS_RES_STATUS (res) = NIS_NOMEMORY;
goto fail;
}
NIS_RES_STATUS (res) = NIS_RES_STATUS (allres);
}
else
{
nis_object *objects_val
= realloc (NIS_RES_OBJECT (allres),
(NIS_RES_NUMOBJ (allres)
+ NIS_RES_NUMOBJ (res))
* sizeof (nis_object));
if (objects_val == NULL)
{
NIS_RES_STATUS (res) = NIS_NOMEMORY;
goto fail;
}
NIS_RES_OBJECT (allres) = objects_val;
memcpy (NIS_RES_OBJECT (allres) + NIS_RES_NUMOBJ (allres),
NIS_RES_OBJECT (res),
NIS_RES_NUMOBJ (res) * sizeof (nis_object));
NIS_RES_NUMOBJ (allres) += NIS_RES_NUMOBJ (res);
NIS_RES_NUMOBJ (res) = 0;
free (NIS_RES_OBJECT (res));
NIS_RES_OBJECT (res) = NULL;
NIS_RES_STATUS (allres) = NIS_RES_STATUS (res);
xdr_free ((xdrproc_t) _xdr_nis_result, (char *) res);
}
clnt_status = __follow_path (&tablepath, &tableptr, ibreq,
&bptr);
if (clnt_status != NIS_SUCCESS)
{
/* Prepare for the nis_freeresult call. */
memset (res, '\0', sizeof (*res));

if (clnt_status == NIS_NOMEMORY)
NIS_RES_STATUS (allres) = clnt_status;
++done;
}
}
else
++done;
break;
@@ -485,6 +539,12 @@ nis_list (const_nis_name name, unsigned int flags,

nis_free_request (ibreq);

if (allres)
{
nis_freeresult (res);
return allres;
}

return res;
}
libnsl_hidden_def (nis_list)
51 changes: 24 additions & 27 deletions nis/nss_nisplus/nisplus-grp.c
Original file line number Diff line number Diff line change
@@ -46,13 +46,13 @@ static char *tableptr;
static netobj cursor;


static nis_name tablename_val;
static size_t tablename_len;
nis_name grp_tablename_val attribute_hidden;
size_t grp_tablename_len attribute_hidden;

static enum nss_status
_nss_create_tablename (int *errnop)
enum nss_status
_nss_grp_create_tablename (int *errnop)
{
if (tablename_val == NULL)
if (grp_tablename_val == NULL)
{
const char *local_dir = nis_local_directory ();
size_t local_dir_len = strlen (local_dir);
@@ -67,11 +67,16 @@ _nss_create_tablename (int *errnop)

memcpy (__stpcpy (p, prefix), local_dir, local_dir_len + 1);

tablename_len = sizeof (prefix) - 1 + local_dir_len;
grp_tablename_len = sizeof (prefix) - 1 + local_dir_len;

atomic_write_barrier ();

tablename_val = p;
if (atomic_compare_and_exchange_bool_acq (&grp_tablename_val, p, NULL))
{
/* Another thread already installed the value. */
free (p);
grp_tablename_len = strlen (grp_tablename_val);
}
}

return NSS_STATUS_SUCCESS;
@@ -103,19 +108,19 @@ internal_setgrent (int *errnop)
{
enum nss_status status = NSS_STATUS_SUCCESS;

if (tablename_val == NULL)
status = _nss_create_tablename (errnop);
if (grp_tablename_val == NULL)
status = _nss_grp_create_tablename (errnop);

if (status == NSS_STATUS_SUCCESS)
{
ibreq = __create_ib_request (tablename_val, 0);
ibreq = __create_ib_request (grp_tablename_val, 0);
if (ibreq == NULL)
{
*errnop = errno;
return NSS_STATUS_TRYAGAIN;
}

nis_error retcode = __prepare_niscall (tablename_val, &dir, &bptr, 0);
nis_error retcode = __prepare_niscall (grp_tablename_val, &dir, &bptr, 0);
if (retcode != NIS_SUCCESS)
{
nis_free_request (ibreq);
@@ -285,13 +290,9 @@ _nss_nisplus_getgrnam_r (const char *name, struct group *gr,
{
int parse_res;

if (tablename_val == NULL)
if (grp_tablename_val == NULL)
{
__libc_lock_lock (lock);

enum nss_status status = _nss_create_tablename (errnop);

__libc_lock_unlock (lock);
enum nss_status status = _nss_grp_create_tablename (errnop);

if (status != NSS_STATUS_SUCCESS)
return status;
@@ -304,10 +305,10 @@ _nss_nisplus_getgrnam_r (const char *name, struct group *gr,
}

nis_result *result;
char buf[strlen (name) + 9 + tablename_len];
char buf[strlen (name) + 9 + grp_tablename_len];
int olderr = errno;

snprintf (buf, sizeof (buf), "[name=%s],%s", name, tablename_val);
snprintf (buf, sizeof (buf), "[name=%s],%s", name, grp_tablename_val);

result = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);

@@ -348,25 +349,21 @@ enum nss_status
_nss_nisplus_getgrgid_r (const gid_t gid, struct group *gr,
char *buffer, size_t buflen, int *errnop)
{
if (tablename_val == NULL)
if (grp_tablename_val == NULL)
{
__libc_lock_lock (lock);

enum nss_status status = _nss_create_tablename (errnop);

__libc_lock_unlock (lock);
enum nss_status status = _nss_grp_create_tablename (errnop);

if (status != NSS_STATUS_SUCCESS)
return status;
}

int parse_res;
nis_result *result;
char buf[8 + 3 * sizeof (unsigned long int) + tablename_len];
char buf[8 + 3 * sizeof (unsigned long int) + grp_tablename_len];
int olderr = errno;

snprintf (buf, sizeof (buf), "[gid=%lu],%s",
(unsigned long int) gid, tablename_val);
(unsigned long int) gid, grp_tablename_val);

result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);

0 comments on commit 59b0795

Please sign in to comment.