chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core, shared: in deserializing, match same files reached via different paths
[elogind.git]
/
src
/
shared
/
socket-util.c
diff --git
a/src/shared/socket-util.c
b/src/shared/socket-util.c
index 6ef68fce09fe1a54682f1bf024a2b077ea746206..c278d6f9d4eae91480b5b2a2f74de67db40e7c7d 100644
(file)
--- a/
src/shared/socket-util.c
+++ b/
src/shared/socket-util.c
@@
-325,9
+325,6
@@
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
if (a->type != b->type)
return false;
if (a->type != b->type)
return false;
- if (a->size != b->size)
- return false;
-
if (socket_address_family(a) != socket_address_family(b))
return false;
if (socket_address_family(a) != socket_address_family(b))
return false;
@@
-352,14
+349,16
@@
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
break;
case AF_UNIX:
break;
case AF_UNIX:
-
if ((a->sockaddr.un.sun_path[0] == 0) != (b->sockaddr.un.sun_path[0] == 0))
return false;
if (a->sockaddr.un.sun_path[0]) {
if ((a->sockaddr.un.sun_path[0] == 0) != (b->sockaddr.un.sun_path[0] == 0))
return false;
if (a->sockaddr.un.sun_path[0]) {
- if (!
strneq(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)
))
+ if (!
path_equal_or_files_same(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path
))
return false;
} else {
return false;
} else {
+ if (a->size != b->size)
+ return false;
+
if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0)
return false;
}
if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0)
return false;
}
@@
-367,7
+366,6
@@
bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
break;
case AF_NETLINK:
break;
case AF_NETLINK:
-
if (a->protocol != b->protocol)
return false;
if (a->protocol != b->protocol)
return false;
@@
-636,12
+634,10
@@
int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret)
int saved_errno = errno;
r = sockaddr_pretty(&sa->sa, salen, true, &ret);
int saved_errno = errno;
r = sockaddr_pretty(&sa->sa, salen, true, &ret);
- if (r < 0) {
- log_error_errno(r, "sockadd_pretty() failed: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "sockadd_pretty() failed: %m");
- log_debug
("getnameinfo(%s) failed: %s", ret, strerror(saved_errno)
);
+ log_debug
_errno(saved_errno, "getnameinfo(%s) failed: %m", ret
);
} else {
ret = strdup(host);
if (!ret)
} else {
ret = strdup(host);
if (!ret)
@@
-659,10
+655,8
@@
int getnameinfo_pretty(int fd, char **ret) {
assert(fd >= 0);
assert(ret);
assert(fd >= 0);
assert(ret);
- if (getsockname(fd, &sa.sa, &salen) < 0) {
- log_error("getsockname(%d) failed: %m", fd);
- return -errno;
- }
+ if (getsockname(fd, &sa.sa, &salen) < 0)
+ return log_error_errno(errno, "getsockname(%d) failed: %m", fd);
return socknameinfo_pretty(&sa, salen, ret);
}
return socknameinfo_pretty(&sa, salen, ret);
}