From 760f409a4add18e1b6ca773c2ccab01162885b9f Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 3 Feb 2015 21:33:04 +0100 Subject: [PATCH] sd-rtnl: allow sd_rtnl_open_fd() to be used on bound sockets --- src/libsystemd/sd-rtnl/sd-rtnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- 2.30.2