Skip to content

Commit 0ca66ad

Browse files
YHNdnzjbluca
authored andcommitted
conf-parser: only read the first found main config file
Follow-up for 93f1da4 and 8ea288d Before the offending commits, we only read the first found main config file. If the main config file is symlinked to/as a drop-in, we should break instead of continuing, for it to be read later.
1 parent 40e1100 commit 0ca66ad

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/shared/conf-parser.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ static int config_parse_many_files(
557557

558558
if (set_contains(inodes, &st)) {
559559
log_debug("%s: symlink to/symlinked as drop-in, will be read later.", *fn);
560-
continue;
560+
break;
561561
}
562562
}
563563

@@ -571,6 +571,8 @@ static int config_parse_many_files(
571571
if (r < 0)
572572
return r;
573573
}
574+
575+
break;
574576
}
575577

576578
/* Then read all the drop-ins. */

0 commit comments

Comments
 (0)