]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-journal: don't check namespaces if we have no namespace to go by
authorLennart Poettering <lennart@poettering.net>
Wed, 22 Apr 2020 17:48:48 +0000 (19:48 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 23 Apr 2020 07:23:53 +0000 (09:23 +0200)
Fixes: #15528
src/journal/sd-journal.c

index a739fa8aafc678c31e28384f541b71212718585e..5c13134b3086906a3cf99f5c804201c1d09e3a67 100644 (file)
@@ -1626,9 +1626,10 @@ static int add_directory(
             !((dirname && dirname_is_machine_id(dirname) > 0) || path_has_prefix(j, path, "/run")))
                 return 0;
 
-        if (!(FLAGS_SET(j->flags, SD_JOURNAL_ALL_NAMESPACES) ||
-              dirname_has_namespace(dirname, j->namespace) > 0 ||
-              (FLAGS_SET(j->flags, SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE) && dirname_has_namespace(dirname, NULL) > 0)))
+        if (dirname &&
+            (!(FLAGS_SET(j->flags, SD_JOURNAL_ALL_NAMESPACES) ||
+               dirname_has_namespace(dirname, j->namespace) > 0 ||
+               (FLAGS_SET(j->flags, SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE) && dirname_has_namespace(dirname, NULL) > 0))))
                 return 0;
 
         r = directory_open(j, path, &d);