confile: allow including nonexisting directories

If an include directive ends with a trailing slash, we now always assume it is a directory and do not treat the non-existence as an error. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

confile: allow including nonexisting directories
dc73e0f0 · Wolfgang Bumiller · 9508fc27 · dc73e0f0
Commit dc73e0f0 authored Jul 05, 2021 by Wolfgang Bumiller
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

confile.c src/lxc/confile.c +2 -2

No files found.
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2689,7 +2689,7 @@ static int do_includedir(const char *dirp, struct lxc_conf *lxc_conf)
 	dir = opendir(dirp);
 	if (!dir)
-		return -errno;
+		return errno == ENOENT ? 0 : -errno;
 	while ((direntp = readdir(dir))) {
 		const char *fnam;
@@ -2726,7 +2726,7 @@ static int set_config_includefiles(const char *key, const char *value,
 		return 0;
 	}
-	if (is_dir(value))
+	if (value[strlen(value)-1] == '/' || is_dir(value))
 		return do_includedir(value, lxc_conf);
 	return lxc_config_read(value, lxc_conf, true);