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-50-g034807a
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2011 22:39:34 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-50-g034807a
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 034807a9cbddfa9e7d35df4cdb2ecce569a00851 (commit)
via 4902da17c8a413ed289528c08a6706d5cdb018dc (commit)
via 5ce33a62951afb0b4186446bea716650db55baf9 (commit)
from c2344f56e41b56036d6a16a30b9f32c19aa932d6 (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=034807a9cbddfa9e7d35df4cdb2ecce569a00851
commit 034807a9cbddfa9e7d35df4cdb2ecce569a00851
Author: Ulrich Drepper <drepper@gmail.com>
Date: Mon Jun 27 13:10:44 2011 -0400
Fix handling of RES_USE_INET6 big in nscd
This fixes BZ #12350 also for nscd.
diff --git a/ChangeLog b/ChangeLog
index 87c90c3..b545852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-06-27 Ulrich Drepper <drepper@gmail.com>
+ [BZ #12350]
+ * nscd/aicache.c (addhstaiX): Restore only RES_USE_INET6
+ bit from old_res_options.
+
* sysdeps/unix/sysv/linux/Makefile (CFLAGS-servicescache.c): Define.
* inet/getnetgrent_r.c (innetgr): Minimal cleanup, use correct return
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 3190a13..6c8d83a 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -534,7 +534,7 @@ next_nip:
}
out:
- _res.options = old_res_options;
+ _res.options |= old_res_options & RES_USE_INET6;
if (dataset != NULL && !alloca_used)
{
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4902da17c8a413ed289528c08a6706d5cdb018dc
commit 4902da17c8a413ed289528c08a6706d5cdb018dc
Author: Ulrich Drepper <drepper@gmail.com>
Date: Mon Jun 27 12:29:04 2011 -0400
Add missing HAVE_SENDFILE definition
diff --git a/ChangeLog b/ChangeLog
index d12f3fb..87c90c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-06-27 Ulrich Drepper <drepper@gmail.com>
+ * sysdeps/unix/sysv/linux/Makefile (CFLAGS-servicescache.c): Define.
+
* inet/getnetgrent_r.c (innetgr): Minimal cleanup, use correct return
value type for setfct.
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index ebb3f5d..f626a22 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -167,5 +167,6 @@ CFLAGS-grpcache.c += -DHAVE_SENDFILE
CFLAGS-hstcache.c += -DHAVE_SENDFILE
CFLAGS-aicache.c += -DHAVE_SENDFILE
CFLAGS-initgrcache.c += -DHAVE_SENDFILE
+CFLAGS-servicescache.c += -DHAVE_SENDFILE
CFLAGS-gai.c += -DNEED_NETLINK
endif
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5ce33a62951afb0b4186446bea716650db55baf9
commit 5ce33a62951afb0b4186446bea716650db55baf9
Author: Ulrich Drepper <drepper@gmail.com>
Date: Mon Jun 27 10:57:37 2011 -0400
Minimal cleanup in innetgr.
diff --git a/ChangeLog b/ChangeLog
index 7ba4fd5..d12f3fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-27 Ulrich Drepper <drepper@gmail.com>
+
+ * inet/getnetgrent_r.c (innetgr): Minimal cleanup, use correct return
+ value type for setfct.
+
2011-06-23 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Use
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 7e13e3b..42045a2 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -339,7 +339,7 @@ innetgr (const char *netgroup, const char *host, const char *user,
{
union
{
- int (*f) (const char *, struct __netgrent *);
+ enum nss_status (*f) (const char *, struct __netgrent *);
void *ptr;
} setfct;
void (*endfct) (struct __netgrent *);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +++++++++++
inet/getnetgrent_r.c | 2 +-
nscd/aicache.c | 2 +-
sysdeps/unix/sysv/linux/Makefile | 1 +
4 files changed, 14 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources