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

resolved: support IPv6 DNS servers on the local link

diff --cc src/basic/in-addr-util.c
index 1447fa84aa08c1f95ec294e77ea6f6a3e36d9218,e5a9daeab8f4e8629279a995f7b521a78ed0ea94..aa7ccd1afdfb024137acd5db964bb36cc19aeefa
--- 1/src/basic/in-addr-util.c
--- 2/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);
  

diff --cc src/basic/in-addr-util.h
Simple merge