|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
diff -up ntp-4.2.6p5/ntpd/ntp_config.c.linklocal ntp-4.2.6p5/ntpd/ntp_config.c
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
--- ntp-4.2.6p5/ntpd/ntp_config.c.linklocal 2016-04-06 13:58:34.659828825 +0200
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+++ ntp-4.2.6p5/ntpd/ntp_config.c 2016-04-06 13:58:39.287842559 +0200
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
@@ -4378,16 +4378,6 @@ get_multiple_netnums(
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
if (pch != NULL)
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
*pch = '\0';
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- pch = strchr(lookup, '%');
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- if (pch != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- if (lookup != lookbuf) {
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- lookup = lookbuf;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- strncpy(lookbuf, nameornum,
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- sizeof(lookbuf));
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- pch = strchr(lookup, '%');
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- }
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- *pch = '\0';
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- }
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
if (AF_INET6 == hints.ai_family && !ipv6_works)
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
commit 4a385df4917a49efb37d89276b42a3d962f3302a
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
Author: <stenn@psp-fb1.ntp.org>
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
Date: Sun Feb 9 08:09:56 2014 +0000
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
[Bug 1186] ntpd fails with link local IPv6 addresses
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
diff -up ntp-4.2.6p5/ntpd/ntp_io.c.linklocal ntp-4.2.6p5/ntpd/ntp_io.c
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
--- ntp-4.2.6p5/ntpd/ntp_io.c.linklocal 2016-04-06 13:58:27.916808820 +0200
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+++ ntp-4.2.6p5/ntpd/ntp_io.c 2016-04-06 13:58:27.943808900 +0200
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
@@ -786,6 +786,9 @@ is_ip_address(
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
{
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
struct in_addr in4;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
struct in6_addr in6;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ struct addrinfo hints;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ struct addrinfo *result;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ struct sockaddr_in6 *resaddr6;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
char tmpbuf[128];
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
char *pch;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
@@ -816,14 +819,16 @@ is_ip_address(
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
*pch = '\0';
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
} else
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
strncpy(tmpbuf, host, sizeof(tmpbuf));
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- pch = strchr(tmpbuf, '%');
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- if (pch != NULL)
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- *pch = '\0';
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
-
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- if (inet_pton(AF_INET6, tmpbuf, &in6) == 1) {
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ ZERO(hints);
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ hints.ai_family = AF_INET6;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ hints.ai_flags |= AI_NUMERICHOST;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ if (getaddrinfo(tmpbuf, NULL, &hints, &result) == 0) {
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
AF(addr) = AF_INET6;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
- SET_ADDR6N(addr, in6);
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ resaddr6 = (struct sockaddr_in6 *)result->ai_addr;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ SET_ADDR6N(addr, resaddr6->sin6_addr);
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ SET_SCOPE(addr, resaddr6->sin6_scope_id);
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
+ freeaddrinfo(result);
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
return TRUE;
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
}
|
|
![](https://seccdn.libravatar.org/avatar/c8b061d59e0ddce6a5ad9e0c1d33f7e97c31d03c77de387ecd7798e993eb4d87?s=16&d=retro) |
3eec3e7 |
}
|