chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c0a72f
)
sd-rtnl: allow sd_rtnl_open_fd() to be used on bound sockets
author
Tom Gundersen
<teg@jklm.no>
Tue, 3 Feb 2015 20:33:04 +0000
(21:33 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Tue, 3 Feb 2015 21:20:38 +0000
(22:20 +0100)
src/libsystemd/sd-rtnl/sd-rtnl.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-rtnl/sd-rtnl.c
b/src/libsystemd/sd-rtnl/sd-rtnl.c
index 45ba50a856be11dcaf553e0acd28fb8db7145457..ae49c77e018f4e023c11b519453e4de01c4d6b38 100644
(file)
--- 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);