Revert "conf-files: introduce CONF_FILES_CHASE_BASENAME flag"
This reverts commit 49653adef3.
The commit was merged without review, and has several issues.
Let's revert the change now, and address the issue pointed out by
the commit later in another way.
This commit is contained in:
@@ -164,9 +164,6 @@ static int files_add(
|
||||
if (!n)
|
||||
return log_oom_debug();
|
||||
|
||||
if (FLAGS_SET(flags, CONF_FILES_CHASE_BASENAME))
|
||||
free_and_replace(p, resolved_path);
|
||||
|
||||
r = hashmap_ensure_put(files, &string_hash_ops_free_free, n, p);
|
||||
if (r < 0) {
|
||||
assert(r == -ENOMEM);
|
||||
|
||||
@@ -8,9 +8,8 @@ typedef enum ConfFilesFlags {
|
||||
CONF_FILES_REGULAR = 1 << 1,
|
||||
CONF_FILES_DIRECTORY = 1 << 2,
|
||||
CONF_FILES_BASENAME = 1 << 3,
|
||||
CONF_FILES_CHASE_BASENAME = 1 << 4, /* If set, also resolve symlink files in config directories. */
|
||||
CONF_FILES_FILTER_MASKED_BY_SYMLINK = 1 << 5,
|
||||
CONF_FILES_FILTER_MASKED_BY_EMPTY = 1 << 6,
|
||||
CONF_FILES_FILTER_MASKED_BY_SYMLINK = 1 << 4,
|
||||
CONF_FILES_FILTER_MASKED_BY_EMPTY = 1 << 5,
|
||||
CONF_FILES_FILTER_MASKED = CONF_FILES_FILTER_MASKED_BY_SYMLINK | CONF_FILES_FILTER_MASKED_BY_EMPTY,
|
||||
} ConfFilesFlags;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user