From: Tom Gundersen <teg@jklm.no>
Date: Tue, 3 Feb 2015 20:33:04 +0000 (+0100)
Subject: sd-rtnl: allow sd_rtnl_open_fd() to be used on bound sockets
X-Git-Tag: v219~160
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=760f409a4add18e1b6ca773c2ccab01162885b9f

sd-rtnl: allow sd_rtnl_open_fd() to be used on bound sockets
---

diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
index 45ba50a85..ae49c77e0 100644
--- a/src/libsystemd/sd-rtnl/sd-rtnl.c
+++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
@@ -146,7 +146,8 @@ static int rtnl_open_fd_ap(sd_rtnl **ret, int fd, unsigned n_groups, va_list ap)
         addrlen = sizeof(rtnl->sockaddr);
 
         r = bind(fd, &rtnl->sockaddr.sa, addrlen);
-        if (r < 0)
+        /* ignore EINVAL to allow opening an already bound socket */
+        if (r < 0 && errno != EINVAL)
                 return -errno;
 
         r = getsockname(fd, &rtnl->sockaddr.sa, &addrlen);