From: Christian Göttsche <cgzones@googlemail.com>
Date: Wed, 28 Jul 2021 14:59:57 +0000 (+0200)
Subject: selinux: improve debug log format
X-Git-Tag: v250-rc1~200
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fbb33f63120b798455290d96d620464e78712e7;p=thirdparty%2Fsystemd.git

selinux: improve debug log format

path might be NULL when checking against the system permissions, so wrap
with strna().

The command line might not be available over D-Bus and thus cl might be
empty. Print "n/a" instead of the empty string.
---

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index f6d4e7cc508..6afc64a7b16 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -280,7 +280,7 @@ int mac_selinux_generic_access_check(
 
         log_full_errno_zerook(LOG_DEBUG, r,
                               "SELinux access check scon=%s tcon=%s tclass=%s perm=%s state=%s function=%s path=%s cmdline=%s: %m",
-                              scon, fcon, tclass, permission, enforce ? "enforcing" : "permissive", function, path, cl);
+                              scon, fcon, tclass, permission, enforce ? "enforcing" : "permissive", function, strna(path), isempty(cl) ? "n/a" : cl);
         return enforce ? r : 0;
 }