This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-379-g49a43d8
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Oct 2011 10:58:00 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-379-g49a43d8
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 49a43d80ec5c97cf6136b1ee2687414773b2d5aa (commit)
via 629f62ef0fbda8602cf796b24df79fb126f06851 (commit)
from aa78043a4aafe5db1a1a76d544a833b63b4c5f5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=49a43d80ec5c97cf6136b1ee2687414773b2d5aa
commit 49a43d80ec5c97cf6136b1ee2687414773b2d5aa
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Oct 17 11:22:13 2011 +0200
Fix syntax error in __THROW macro
diff --git a/ChangeLog b/ChangeLog
index ab651ff..32a6a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-10-17 Andreas Schwab <schwab@redhat.com>
+ * misc/sys/cdefs.h: Fix last change.
+
* grp/initgroups.c (internal_getgrouplist): Fix initgroups
database lookup.
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index bef8be7..72073e8 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -53,8 +53,8 @@
as non-throwing using a function attribute since programs can use
the -fexceptions options for C code as well. */
# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
-# define __THROW __attribute__ ((__nothrow__ __LEAF_ATTR))
-# define __NTH(fct) __attribute__ ((__nothrow__ __LEAF_ATTR)) fct
+# define __THROW __attribute__ ((__nothrow__ __LEAF))
+# define __NTH(fct) __attribute__ ((__nothrow__ __LEAF)) fct
# else
# if defined __cplusplus && __GNUC_PREREQ (2,8)
# define __THROW throw ()
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=629f62ef0fbda8602cf796b24df79fb126f06851
commit 629f62ef0fbda8602cf796b24df79fb126f06851
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Oct 14 17:57:07 2011 +0200
Correctly handle missing initgroups database
diff --git a/ChangeLog b/ChangeLog
index dfd6a3b..ab651ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-17 Andreas Schwab <schwab@redhat.com>
+
+ * grp/initgroups.c (internal_getgrouplist): Fix initgroups
+ database lookup.
+
2011-10-16 Ulrich Drepper <drepper@gmail.com>
* misc/sys/cdefs.h: Use leaf function attribute in __THROW.
diff --git a/grp/initgroups.c b/grp/initgroups.c
index 48119ff..c63bba1 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -82,9 +82,8 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
if (__nss_initgroups_database == NULL)
{
- no_more = __nss_database_lookup ("initgroups", NULL, "",
- &__nss_initgroups_database);
- if (no_more == 0 && __nss_initgroups_database == NULL)
+ if (__nss_database_lookup ("initgroups", NULL, "",
+ &__nss_initgroups_database) < 0)
{
if (__nss_group_database == NULL)
no_more = __nss_database_lookup ("group", NULL, "compat files",
@@ -92,11 +91,8 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
__nss_initgroups_database = __nss_group_database;
}
- else if (__nss_initgroups_database != NULL)
- {
- assert (no_more == 0);
- use_initgroups_entry = true;
- }
+ else
+ use_initgroups_entry = true;
}
else
/* __nss_initgroups_database might have been set through
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
grp/initgroups.c | 12 ++++--------
misc/sys/cdefs.h | 4 ++--
3 files changed, 13 insertions(+), 10 deletions(-)
hooks/post-receive
--
GNU C Library master sources