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
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 48c43a28800447d7a9c58d8932cc660dd8419a05..88aae4815b30da05723d05c91a49e961d0706bfa 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-2100,7
+2100,7
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_FIFO &&
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_FIFO &&
-
streq_ptr
(p->path, value+skip))
+
path_equal_or_files_same
(p->path, value+skip))
break;
if (p) {
break;
if (p) {
@@
-2119,7
+2119,7
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_SPECIAL &&
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_SPECIAL &&
-
streq_ptr
(p->path, value+skip))
+
path_equal_or_files_same
(p->path, value+skip))
break;
if (p) {
break;
if (p) {
@@
-2138,7
+2138,7
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_MQUEUE &&
LIST_FOREACH(port, p, s->ports)
if (p->type == SOCKET_MQUEUE &&
- streq
_ptr
(p->path, value+skip))
+ streq(p->path, value+skip))
break;
if (p) {
break;
if (p) {