From 6a4643517bd67cd504ec779dda68f469e178aec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 17 Sep 2017 15:26:01 +0200 Subject: [PATCH] conf-files: fix check for masking with empty files Fixes #6831. --- src/basic/conf-files.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c index d776583c05d..907d1350fe6 100644 --- a/src/basic/conf-files.c +++ b/src/basic/conf-files.c @@ -74,16 +74,21 @@ static int files_add(Hashmap *h, const char *suffix, const char *root, unsigned continue; } - /* We only want executable regular files (or symlinks to them), or symlinks to /dev/null */ - if (S_ISREG(st.st_mode)) { - if ((st.st_mode & 0111) == 0) { /* not executable */ - log_debug("Ignoring %s/%s, as it is not marked executable.", dirpath, de->d_name); + if (!null_or_empty(&st)) { + /* A mask is a symlink to /dev/null or an empty file. It does not even + * have to be executable. Other entries must be regular executable files + * or symlinks to them. */ + if (S_ISREG(st.st_mode)) { + if ((st.st_mode & 0111) == 0) { /* not executable */ + log_debug("Ignoring %s/%s, as it is not marked executable.", + dirpath, de->d_name); + continue; + } + } else { + log_debug("Ignoring %s/%s, as it is neither a regular file nor a mask.", + dirpath, de->d_name); continue; } - - } else if (!null_or_empty(&st)) { /* /dev/null? */ - log_debug("Ignoring %s/%s, as it is not a regular file (or symlink to /dev/null).", dirpath, de->d_name); - continue; } }