SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18579 from keszybz/fix-fragment-id-crash

Browse Source 
Fix fragment id crash
This commit is contained in:
Lennart Poettering
2021-02-15 23:35:25 +01:00
committed by GitHub
parent 0886999416 3b5ab02119
commit 83ce3b1944
3 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/unit-file.c
+8 -6
View File
@@ -354,10 +354,16 @@ int unit_file_build_name_map(
/* Check if the symlink goes outside of our search path.
* If yes, it's a linked unit file or mask, and we don't care about the target name.
* Let's just store the link destination directly.
* Let's just store the link source directly.
* If not, let's verify that it's a good symlink. */
char *tail = path_startswith_strv(simplified, lp->search_path);
if (tail) {
if (!tail) {
log_debug("%s: linked unit file: %s → %s",
__func__, filename, simplified);
dst = filename;
} else {
bool self_alias;
dst = basename(simplified);
@@ -380,10 +386,6 @@ int unit_file_build_name_map(
}
log_debug("%s: alias: %s/%s → %s", __func__, *dir, de->d_name, dst);
} else {
dst = simplified;
log_debug("%s: linked unit file: %s/%s → %s", __func__, *dir, de->d_name, dst);
}
} else {