From: Michael Biebl <biebl@debian.org>
Date: Wed, 29 Jun 2011 00:22:41 +0000 (+0200)
Subject: Revert "Ignore unknown capabilities when dropping them"
X-Git-Tag: 29-1~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4953794fb2b95c5b7ce97cd17a985b6e8ace566b;p=systemd

Revert "Ignore unknown capabilities when dropping them"

This reverts commit 05039b037a79771aca728eed8d88e3171d12ad05.

We will use the upstream fix for that.
---

diff --git a/debian/changelog b/debian/changelog
index e3fdac68..18856c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ systemd (29-1) UNRELEASED; urgency=low
     - Includes typo fixes in documentation.  Closes: #623520
   * Fall back to the init script reload function if a native .service file
     doesn't know how to reload.  Closes: #628186
-  * Ignore unknown capabilities when dropping them.  Closes: #628081
   * Add hard dependency on udev.  Closes: #627921
 
   [ Michael Biebl ]
diff --git a/src/execute.c b/src/execute.c
index 7d89096a..a62f9dbb 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -960,13 +960,6 @@ static int do_capability_bounding_set_drop(uint64_t drop) {
         for (i = 0; i <= CAP_LAST_CAP; i++)
                 if (drop & ((uint64_t) 1ULL << (uint64_t) i)) {
                         if (prctl(PR_CAPBSET_DROP, i) < 0) {
-
-                                /* If this capability is not known,
-                                 * EINVAL will be returned, let's
-                                 * ignore this. */
-                                if (errno == EINVAL)
-                                        continue;
-
                                 r = -errno;
                                 goto finish;
                         }