X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcapability.c;h=0226542c6cbd1799ee8883f204ce883d26924419;hb=592fd144ae313855f48d0ca52a103013b41e5d59;hp=69e054b1ff55df5140595e8c2b8644796b5b35f4;hpb=966bff2660a13c82b70a1e1ac4f1a48bb33d7f7e;p=elogind.git

diff --git a/src/shared/capability.c b/src/shared/capability.c
index 69e054b1f..0226542c6 100644
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -85,9 +85,9 @@ unsigned long cap_last_cap(void) {
 }
 
 int capability_bounding_set_drop(uint64_t drop, bool right_now) {
-        unsigned long i;
-        _cleanup_cap_free_ cap_t after_cap = NULL, temp_cap = NULL;
+        _cleanup_cap_free_ cap_t after_cap = NULL;
         cap_flag_value_t fv;
+        unsigned long i;
         int r;
 
         /* If we are run as PID 1 we will lack CAP_SETPCAP by default
@@ -103,6 +103,7 @@ int capability_bounding_set_drop(uint64_t drop, bool right_now) {
                 return -errno;
 
         if (fv != CAP_SET) {
+                _cleanup_cap_free_ cap_t temp_cap = NULL;
                 static const cap_value_t v = CAP_SETPCAP;
 
                 temp_cap = cap_dup(after_cap);
@@ -214,11 +215,9 @@ int capability_bounding_set_drop_usermode(uint64_t drop) {
         return r;
 }
 
-int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
+int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
 
         _cleanup_cap_free_ cap_t d = NULL;
-        cap_value_t bits[sizeof(keep_capabilites)*8];
-        unsigned i, j = 0;
         int r;
 
         /* Unfortunately we cannot leave privilege dropping to PID 1
@@ -229,7 +228,7 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
          * which we want to avoid. */
 
         if (setresgid(gid, gid, gid) < 0) {
-                log_error("Failed change group ID: %m");
+                log_error("Failed to change group ID: %m");
                 return -errno;
         }
 
@@ -245,7 +244,7 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
 
         r = setresuid(uid, uid, uid);
         if (r < 0) {
-                log_error("Failed change user ID: %m");
+                log_error("Failed to change user ID: %m");
                 return -errno;
         }
 
@@ -254,7 +253,7 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
                 return -errno;
         }
 
-        r = capability_bounding_set_drop(~keep_capabilites, true);
+        r = capability_bounding_set_drop(~keep_capabilities, true);
         if (r < 0) {
                 log_error("Failed to drop capabilities: %s", strerror(-r));
                 return r;
@@ -264,14 +263,19 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
         if (!d)
                 return log_oom();
 
-        for (i = 0; i < sizeof(keep_capabilites)*8; i++)
-                if (keep_capabilites & (1ULL << i))
-                        bits[j++] = i;
+        if (keep_capabilities) {
+                cap_value_t bits[sizeof(keep_capabilities)*8];
+                unsigned i, j = 0;
 
-        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");
-                return -errno;
+                for (i = 0; i < sizeof(keep_capabilities)*8; i++)
+                        if (keep_capabilities & (1ULL << i))
+                                bits[j++] = i;
+
+                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");
+                        return -errno;
+                }
         }
 
         if (cap_set_proc(d) < 0) {