From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Thu, 9 Jun 2016 08:18:07 +0000 (+0200)
Subject: Merge pull request #3432 from poettering/resolved-ll-ipv6
X-Git-Tag: v231~198
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=207c0b0ee30f32ef6ddcb60f67d7a27d73bf4a18;p=thirdparty%2Fsystemd.git

Merge pull request #3432 from poettering/resolved-ll-ipv6

resolved: support IPv6 DNS servers on the local link
---

207c0b0ee30f32ef6ddcb60f67d7a27d73bf4a18
diff --cc src/basic/in-addr-util.c
index 1447fa84aa0,e5a9daeab8f..aa7ccd1afdf
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@@ -26,20 -27,9 +27,21 @@@
  #include "alloc-util.h"
  #include "in-addr-util.h"
  #include "macro.h"
+ #include "parse-util.h"
  #include "util.h"
  
 +bool in4_addr_is_null(const struct in_addr *a) {
 +        return a->s_addr == 0;
 +}
 +
 +bool in6_addr_is_null(const struct in6_addr *a) {
 +        return
 +                a->s6_addr32[0] == 0 &&
 +                a->s6_addr32[1] == 0 &&
 +                a->s6_addr32[2] == 0 &&
 +                a->s6_addr32[3] == 0;
 +}
 +
  int in_addr_is_null(int family, const union in_addr_union *u) {
          assert(u);