treewide: use log_*_errno whenever %m is in the format string

[elogind.git] / src / shared / capability.c

diff --git a/src/shared/capability.c b/src/shared/capability.c
index 89e61430b0d21603f5bafa16809133369b028ffa..e2e0dd1a337dd64cce77b2156709bcea7c2951f0 100644 (file)
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -228,36 +228,34 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
          * which we want to avoid. */
 
         if (setresgid(gid, gid, gid) < 0) {
-                log_error("Failed to change group ID: %m");
+                log_error_errno(errno, "Failed to change group ID: %m");
                 return -errno;
         }
 
         if (setgroups(0, NULL) < 0) {
-                log_error("Failed to drop auxiliary groups list: %m");
+                log_error_errno(errno, "Failed to drop auxiliary groups list: %m");
                 return -errno;
         }
 
         if (prctl(PR_SET_KEEPCAPS, 1) < 0) {
-                log_error("Failed to enable keep capabilities flag: %m");
+                log_error_errno(errno, "Failed to enable keep capabilities flag: %m");
                 return -errno;
         }
 
         r = setresuid(uid, uid, uid);
         if (r < 0) {
-                log_error("Failed to change user ID: %m");
+                log_error_errno(errno, "Failed to change user ID: %m");
                 return -errno;
         }
 
         if (prctl(PR_SET_KEEPCAPS, 0) < 0) {
-                log_error("Failed to disable keep capabilities flag: %m");
+                log_error_errno(errno, "Failed to disable keep capabilities flag: %m");
                 return -errno;
         }
 
         r = capability_bounding_set_drop(~keep_capabilities, true);
-        if (r < 0) {
-                log_error_errno(r, "Failed to drop capabilities: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to drop capabilities: %m");
 
         d = cap_init();
         if (!d)
@@ -273,13 +271,13 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
 
                 if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 ||
                     cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) {
-                        log_error("Failed to enable capabilities bits: %m");
+                        log_error_errno(errno, "Failed to enable capabilities bits: %m");
                         return -errno;
                 }
         }
 
         if (cap_set_proc(d) < 0) {
-                log_error("Failed to increase capabilities: %m");
+                log_error_errno(errno, "Failed to increase capabilities: %m");
                 return -errno;
         }