diff options
| author | Michael Marineau <michael.marineau@coreos.com> | 2014-01-31 15:35:04 -0800 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-02-14 00:58:00 +0100 |
| commit | 112cfb181453e38d3ef4a74fba23abbb53392002 (patch) | |
| tree | 29bed2d262a751a8297712f71123a5fb7e75c1b4 /src/shared/path-lookup.c | |
| parent | b58b227a53ee2b9feba8433a1558b51132ffb18b (diff) | |
shared: include root when canonicalizing conf paths
The conf_files_list family accepts an alternate root path to prefix all
directories in the list but path_strv_canonicalize_uniq doesn't use it.
This results in the suspicious behavior of resolving directory symlinks
based on the contents of / instead of the alternate root.
This adds a prefix argument to path_strv_canonicalize which will now
prepend the prefix, if given, to every path in the list. To avoid
answering what a relative path means when called with a root prefix
path_strv_canonicalize is now path_strv_canonicalize_absolute and only
considers absolute paths. Fortunately all users of already call
path_strv_canonicalize with a list of absolute paths.
Diffstat (limited to 'src/shared/path-lookup.c')
| -rw-r--r-- | src/shared/path-lookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index e2ca9420d9..63af43cdbb 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -275,7 +275,7 @@ int lookup_paths_init( } } - if (!path_strv_canonicalize(p->unit_path)) + if (!path_strv_canonicalize_absolute(p->unit_path, NULL)) return -ENOMEM; strv_uniq(p->unit_path); @@ -331,10 +331,10 @@ int lookup_paths_init( return -ENOMEM; } - if (!path_strv_canonicalize(p->sysvinit_path)) + if (!path_strv_canonicalize_absolute(p->sysvinit_path, NULL)) return -ENOMEM; - if (!path_strv_canonicalize(p->sysvrcnd_path)) + if (!path_strv_canonicalize_absolute(p->sysvrcnd_path, NULL)) return -ENOMEM; strv_uniq(p->sysvinit_path); |