summaryrefslogtreecommitdiff
path: root/src/shared/path-util.h
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2015-02-19 23:12:38 +0100
committerMichal Schmidt <mschmidt@redhat.com>2015-02-20 03:35:04 +0100
commitc78e47a61fa8d9a21fece01c83e4c26ce0938d27 (patch)
treec70d451e2641aea02d6dfed70fa5ddd166ba93ef /src/shared/path-util.h
parent00d053d3cacab6628405d704c5049274e1be297e (diff)
core, shared: in deserializing, match same files reached via different paths
When dbus.socket is updated like this: -ListenStream=/var/run/dbus/system_bus_socket +ListenStream=/run/dbus/system_bus_socket ... and daemon-reload is performed, bad things happen. During deserialization systemd does not recognize that the two paths refer to the same named socket and replaces the socket file with a new one. As a result, applications hang when they try talking to dbus. Fix this by finding a match not only when the path names are equal, but also when they point to the same inode. In socket_address_equal() it is necessary to move the address size comparison into the abstract sockets branch. For path name sockets the comparison must not be done and for other families it is redundant (their sizes are constant and checked by socket_address_verify()). FIFOs and special files can also have multiple pathnames, so compare the inodes for them as well. Note that previously the pathname checks used streq_ptr(), but the paths cannot be NULL. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1186018
Diffstat (limited to 'src/shared/path-util.h')
-rw-r--r--src/shared/path-util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
index bd0d32473f..bcf116ed3d 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -45,6 +45,7 @@ int path_make_relative(const char *from_dir, const char *to_path, char **_r);
char* path_kill_slashes(char *path);
char* path_startswith(const char *path, const char *prefix) _pure_;
bool path_equal(const char *a, const char *b) _pure_;
+bool path_equal_or_files_same(const char *a, const char *b);
char* path_join(const char *root, const char *path, const char *rest);
char** path_strv_make_absolute_cwd(char **l);