Merge branch 'master' of ssh://sourceware.org/git/glibc
This commit is contained in:
commit
1de911c874
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
|||
2011-07-06 Ulrich Drepper <drepper@gmail.com>
|
||||
|
||||
* inet/getnetgrent_r.c (internal_getnetgrent_r): Fix check for known
|
||||
netgroups to read.
|
||||
(innetgr): Likewise.
|
||||
|
||||
2011-07-05 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* config.make.in (install_root): Default to $(DESTDIR).
|
||||
|
||||
2011-07-05 Ulrich Drepper <drepper@gmail.com>
|
||||
|
||||
* nscd/nscd_getserv_r.c (nscd_getserv_r): Add cast to avoid warning.
|
||||
|
||||
2011-07-02 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* Makerules ($(common-objpfx)format.lds): Fail if result is empty.
|
||||
|
|
|
@ -5,7 +5,7 @@ version = @VERSION@
|
|||
release = @RELEASE@
|
||||
|
||||
# Installation prefixes.
|
||||
install_root =
|
||||
install_root = $(DESTDIR)
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datadir = @datadir@
|
||||
|
|
|
@ -279,6 +279,11 @@ internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
|
|||
namep = namep->next)
|
||||
if (strcmp (datap->val.group, namep->name) == 0)
|
||||
break;
|
||||
if (namep == NULL)
|
||||
for (namep = datap->needed_groups; namep != NULL;
|
||||
namep = namep->next)
|
||||
if (strcmp (datap->val.group, namep->name) == 0)
|
||||
break
|
||||
if (namep != NULL)
|
||||
/* Really ignore. */
|
||||
continue;
|
||||
|
@ -384,6 +389,11 @@ innetgr (const char *netgroup, const char *host, const char *user,
|
|||
namep = namep->next)
|
||||
if (strcmp (entry.val.group, namep->name) == 0)
|
||||
break;
|
||||
if (namep == NULL)
|
||||
for (namep = entry.needed_groups; namep != NULL;
|
||||
namep = namep->next)
|
||||
if (strcmp (entry.val.group, namep->name) == 0)
|
||||
break;
|
||||
if (namep == NULL
|
||||
&& strcmp (netgroup, entry.val.group) != 0)
|
||||
{
|
||||
|
|
|
@ -374,7 +374,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto,
|
|||
if (retval != -1)
|
||||
{
|
||||
if (!alloca_aliases_len)
|
||||
free (aliases_len);
|
||||
free ((void *) aliases_len);
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue