[systemd-commits] 2 commits - src/resolve src/shared

[Lennart Poettering]

 src/resolve/resolved-dns-stream.c |    4 ++--
 src/shared/missing.h              |    8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 747c0ff5648b707abb601f58eefcfd92a7d41695
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 1 19:25:06 2014 +0200

    resolved: IPV6_UNICAST_IF may fail if we already are bound to a device, like we are for link-local addresses

diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c
index 9a0d59d..eb78587 100644
--- a/src/resolve/resolved-dns-stream.c
+++ b/src/resolve/resolved-dns-stream.c
@@ -172,11 +172,11 @@ static int dns_stream_identify(DnsStream *s) {
                 if (s->local.sa.sa_family == AF_INET) {
                         r = setsockopt(s->fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex));
                         if (r < 0)
-                                return -errno;
+                                log_debug("Failed to invoke IP_UNICAST_IF: %m");
                 } else if (s->local.sa.sa_family == AF_INET6) {
                         r = setsockopt(s->fd, IPPROTO_IPV6, IPV6_UNICAST_IF, &ifindex, sizeof(ifindex));
                         if (r < 0)
-                                return -errno;
+                                log_debug("Failed to invoke IPV6_UNICAST_IF: %m");
                 }
         }
 

commit 919881496856e2e474774e6ed2d29c25a48c0ff5
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 1 18:55:56 2014 +0200

    missing: add missing bonding definitions

diff --git a/src/shared/missing.h b/src/shared/missing.h
index 083b85a..d54cc1e 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -511,3 +511,11 @@ static inline int setns(int fd, int nstype) {
 #ifndef IFF_DORMANT
 #define IFF_DORMANT 0x20000
 #endif
+
+#ifndef BOND_XMIT_POLICY_ENCAP23
+#define BOND_XMIT_POLICY_ENCAP23 3
+#endif
+
+#ifndef BOND_XMIT_POLICY_ENCAP34
+#define BOND_XMIT_POLICY_ENCAP34 4
+#endif