chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: merge /etc/xdg/systemd/session and /etc/systemd/session
[elogind.git]
/
manager.c
diff --git
a/manager.c
b/manager.c
index 46b187658d3534cc52892391e097b2ad6a485f40..88dc64bb655771d56055fa8bf50d29d59b046c15 100644
(file)
--- a/
manager.c
+++ b/
manager.c
@@
-149,12
+149,12
@@
static char** session_dirs(void) {
}
if ((e = getenv("XDG_CONFIG_DIRS")))
}
if ((e = getenv("XDG_CONFIG_DIRS")))
- config_dirs = strv_split(e, ":");
- else
- config_dirs = strv_new("/etc/xdg", NULL);
+ if (!(config_dirs = strv_split(e, ":")))
+ goto fail;
- if (!config_dirs)
- goto fail;
+ /* We don't treat /etc/xdg/systemd here as the spec
+ * suggests because we assume that that is a link to
+ * /etc/systemd/ anyway. */
if ((e = getenv("XDG_DATA_HOME"))) {
if (asprintf(&data_home, "%s/systemd/session", e) < 0)
if ((e = getenv("XDG_DATA_HOME"))) {
if (asprintf(&data_home, "%s/systemd/session", e) < 0)