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.25-549-gf768b45
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Jun 2017 14:06:04 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-549-gf768b45
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 f768b450204f54b080ea5dc5c2071940604b424c (commit)
from 0a47d031e44f15236bcef8aeba80e737bd013c6f (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f768b450204f54b080ea5dc5c2071940604b424c
commit f768b450204f54b080ea5dc5c2071940604b424c
Author: Benjamin Cama <b.cama@kerlink.fr>
Date: Thu Jun 22 15:49:28 2017 +0200
inet: __inet6_scopeid_pton should accept node-local addresses [BZ #21657]
diff --git a/ChangeLog b/ChangeLog
index 46a70ff..72ab9be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-21 Benjamin Cama <b.cama@kerlink.fr>
+
+ [BZ #21657]
+ * inet/inet6_scopeid_pton.c (__inet6_scopeid_pton): Permit scopes
+ on node-local addresses.
+ * inet/tst-inet6_scopeid_pton.c (do_test): Adjust test.
+
2017-06-21 Florian Weimer <fweimer@redhat.com>
* intl/loadmsgcat.c: Remove alloca support.
diff --git a/inet/inet6_scopeid_pton.c b/inet/inet6_scopeid_pton.c
index f842ffc..e09b1cb 100644
--- a/inet/inet6_scopeid_pton.c
+++ b/inet/inet6_scopeid_pton.c
@@ -33,6 +33,7 @@ __inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
uint32_t *result)
{
if (IN6_IS_ADDR_LINKLOCAL (address)
+ || IN6_IS_ADDR_MC_NODELOCAL (address)
|| IN6_IS_ADDR_MC_LINKLOCAL (address))
{
uint32_t number = __if_nametoindex (scope);
diff --git a/inet/tst-inet6_scopeid_pton.c b/inet/tst-inet6_scopeid_pton.c
index a1bafa9..8225b3b 100644
--- a/inet/tst-inet6_scopeid_pton.c
+++ b/inet/tst-inet6_scopeid_pton.c
@@ -218,9 +218,9 @@ do_test (void)
{
expect_success ("fe80::1", interface_name, interface_index);
expect_success ("ff02::1", interface_name, interface_index);
+ expect_success ("ff01::1", interface_name, interface_index);
expect_failure ("::", interface_name);
expect_failure ("::1", interface_name);
- expect_failure ("ff01::1", interface_name);
expect_failure ("2001:db8::1", interface_name);
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
inet/inet6_scopeid_pton.c | 1 +
inet/tst-inet6_scopeid_pton.c | 2 +-
3 files changed, 9 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources