From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Sep 2021 15:08:58 +0000 (+0200)
Subject: smack-util: tiny simplification
X-Git-Tag: v250-rc1~630
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=f7c9ade22fcd0156fb76a3e1dbdac76883f43472;p=systemd%2F.git

smack-util: tiny simplification
---

diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
index 01958f0b0d..1d04020027 100644
--- a/src/shared/smack-util.c
+++ b/src/shared/smack-util.c
@@ -286,14 +286,13 @@ int mac_smack_copy(const char *dest, const char *src) {
 #endif
 
 int rename_and_apply_smack_floor_label(const char *from, const char *to) {
-        int r = 0;
+
         if (rename(from, to) < 0)
                 return -errno;
 
 #if HAVE_SMACK_RUN_LABEL
-        r = mac_smack_apply(to, SMACK_ATTR_ACCESS, SMACK_FLOOR_LABEL);
-        if (r < 0)
-                return r;
+        return mac_smack_apply(to, SMACK_ATTR_ACCESS, SMACK_FLOOR_LABEL);
+#else
+        return 0;
 #endif
-        return r;
 }