From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 6 Feb 2020 10:47:28 +0000 (+0900)
Subject: selinux: update log message to suppress warning by coverity
X-Git-Tag: v245-rc2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b6a90d17f4c5983f6510e8675ae83008f62e0f5;p=thirdparty%2Fsystemd.git

selinux: update log message to suppress warning by coverity

Fixes CID#1417440 and CID#1417438.
---

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index 4500e4452fa..fb382317027 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -223,7 +223,7 @@ int mac_selinux_generic_access_check(
 
                 r = getfilecon_raw(path, &fcon);
                 if (r < 0) {
-                        log_warning_errno(errno, "SELinux getfilecon_raw on '%s' failed: %m (tclass=%s perm=%s)", path, tclass, permission);
+                        log_warning_errno(errno, "SELinux getfilecon_raw on '%s' failed (tclass=%s perm=%s): %m", path, tclass, permission);
                         r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get file context on %s.", path);
                         goto finish;
                 }
@@ -232,7 +232,7 @@ int mac_selinux_generic_access_check(
         } else {
                 r = getcon_raw(&fcon);
                 if (r < 0) {
-                        log_warning_errno(errno, "SELinux getcon_raw failed: %m (tclass=%s perm=%s)", tclass, permission);
+                        log_warning_errno(errno, "SELinux getcon_raw failed (tclass=%s perm=%s): %m", tclass, permission);
                         r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get current context.");
                         goto finish;
                 }