X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-cap-list.c;h=632d62ff8f95612a095366b1e7cae56c6a7fba32;hb=caac2704d57ef6d95f7053456479353bae3638de;hp=238f876f2a1fb5b7ca870abac5ac83c80fd3e77d;hpb=4b7c1d5d6a006088910bac42ab3b777be9cf3cc1;p=elogind.git

diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 238f876f2..632d62ff8 100644
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -19,17 +19,21 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "util.h"
 #include "log.h"
+#include "fileio.h"
 #include "cap-list.h"
 #include "capability.h"
+#include <sys/prctl.h>
 
-int main(int argc, char *argv[]) {
+/* verify the capability parser */
+static void test_cap_list(void) {
         int i;
 
         assert_se(!capability_to_name(-1));
-        assert_se(!capability_to_name(cap_last_cap()+1));
+        assert_se(!capability_to_name(capability_list_length()));
 
-        for (i = 0; i <= (int) cap_last_cap(); i++) {
+        for (i = 0; i < capability_list_length(); i++) {
                 const char *n;
 
                 assert_se(n = capability_to_name(i));
@@ -45,15 +49,15 @@ int main(int argc, char *argv[]) {
         assert_se(capability_from_name("15") == 15);
         assert_se(capability_from_name("-1") == -EINVAL);
 
-        for (i = 0; i <= (int) cap_last_cap(); i++) {
+        for (i = 0; i < capability_list_length(); i++) {
                 _cleanup_cap_free_charp_ char *a = NULL;
                 const char *b;
                 unsigned u;
 
                 assert_se(a = cap_to_name(i));
 
-                /* quite the loop as soon as libcap only returns
-                 * numeric ids, formatted as string */
+                /* quit the loop as soon as libcap starts returning
+                 * numeric ids, formatted as strings */
                 if (safe_atou(a, &u) >= 0)
                         break;
 
@@ -61,8 +65,47 @@ int main(int argc, char *argv[]) {
 
                 printf("%s vs. %s\n", a, b);
 
-                assert_se(streq(a, b));
+                assert_se(strcasecmp(a, b) == 0);
+        }
+}
+
+/* verify cap_last_cap() against /proc/sys/kernel/cap_last_cap */
+static void test_last_cap_file(void) {
+        _cleanup_free_ char *content = NULL;
+        unsigned long val = 0;
+        int r;
+
+        r = read_one_line_file("/proc/sys/kernel/cap_last_cap", &content);
+        assert_se(r >= 0);
+
+        r = safe_atolu(content, &val);
+        assert_se(r >= 0);
+        assert_se(val != 0);
+        assert_se(val == cap_last_cap());
+}
+
+/* verify cap_last_cap() against syscall probing */
+static void test_last_cap_probe(void) {
+        unsigned long p = (unsigned long)CAP_LAST_CAP;
+
+        if (prctl(PR_CAPBSET_READ, p) < 0) {
+                for (p--; p > 0; p --)
+                        if (prctl(PR_CAPBSET_READ, p) >= 0)
+                                break;
+        } else {
+                for (;; p++)
+                        if (prctl(PR_CAPBSET_READ, p+1) < 0)
+                                break;
         }
 
+        assert_se(p != 0);
+        assert_se(p == cap_last_cap());
+}
+
+int main(int argc, char *argv[]) {
+        test_cap_list();
+        test_last_cap_file();
+        test_last_cap_probe();
+
         return 0;
 }