capability: fix omission of capability structure field names

* capability.c (print_cap_header, print_cap_data): Add field names
to the output.
* tests/caps.awk: Update test output.

diff --git a/capability.c b/capability.c
index 421649d57c682c191881322c82341a00666dc406..5daefa6cc40e6b6772498751f290d7e48ccef073 100644 (file)
--- a/capability.c
+++ b/capability.c
@@ -85,10 +85,10 @@ print_cap_header(struct tcb *tcp, unsigned long addr, cap_user_header_t h)
                return;
        }
 
-       tprints("{");
+       tprints("{version=");
        printxval(cap_version, h->version,
                  "_LINUX_CAPABILITY_VERSION_???");
-       tprintf(", %d}", h->pid);
+       tprintf(", pid=%d}", h->pid);
 }
 
 static void
@@ -124,11 +124,11 @@ print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
        if (umoven_or_printaddr(tcp, addr, len * sizeof(data[0]), data))
                return;
 
-       tprints("{");
+       tprints("{effective=");
        print_cap_bits(data[0].effective, len > 1 ? data[1].effective : 0);
-       tprints(", ");
+       tprints(", permitted=");
        print_cap_bits(data[0].permitted, len > 1 ? data[1].permitted : 0);
-       tprints(", ");
+       tprints(", inheritable=");
        print_cap_bits(data[0].inheritable, len > 1 ? data[1].inheritable : 0);
        tprints("}");
 }

diff --git a/tests/caps.awk b/tests/caps.awk
index 613048295366c94fc69d7452034bc8722708c1d2..c6e31efa237366b542083f7a5a820b9f8a06191d 100644 (file)
--- a/tests/caps.awk
+++ b/tests/caps.awk
@@ -35,19 +35,19 @@ BEGIN {
        r_addr = "0x[[:xdigit:]]+"
        s[1] = "capget(NULL, NULL) = " s_efault
        r[2] = "^capget\\(" r_addr ", " r_addr "\\) = " r_efault
-       r[3] = "^capget\\(\\{_LINUX_CAPABILITY_VERSION_3, 0\\}, " r_addr "\\) = " r_efault
-       r[4] = "^capget\\(\\{_LINUX_CAPABILITY_VERSION_3, 0\\}, \\{" cap ", " cap ", " cap "\\}\\) = 0$"
+       r[3] = "^capget\\(\\{version=_LINUX_CAPABILITY_VERSION_3, pid=0\\}, " r_addr "\\) = " r_efault
+       r[4] = "^capget\\(\\{version=_LINUX_CAPABILITY_VERSION_3, pid=0\\}, \\{effective=" cap ", permitted=" cap ", inheritable=" cap "\\}\\) = 0$"
 
-       capset_v1_data = "{1<<CAP_DAC_OVERRIDE, 1<<CAP_DAC_READ_SEARCH, 0}"
-       capset_v3hi_data = "{1<<CAP_WAKE_ALARM, 1<<CAP_BLOCK_SUSPEND, 0}"
-       capset_data = "{1<<CAP_DAC_OVERRIDE|1<<CAP_WAKE_ALARM, 1<<CAP_DAC_READ_SEARCH|1<<CAP_BLOCK_SUSPEND, 0}"
+       capset_v1_data = "{effective=1<<CAP_DAC_OVERRIDE, permitted=1<<CAP_DAC_READ_SEARCH, inheritable=0}"
+       capset_v3hi_data = "{effective=1<<CAP_WAKE_ALARM, permitted=1<<CAP_BLOCK_SUSPEND, inheritable=0}"
+       capset_data = "{effective=1<<CAP_DAC_OVERRIDE|1<<CAP_WAKE_ALARM, permitted=1<<CAP_DAC_READ_SEARCH|1<<CAP_BLOCK_SUSPEND, inheritable=0}"
        s[5] = "capset(NULL, NULL) = " s_efault
        r[6] = "^capset\\(" r_addr ", " r_addr "\\) = " r_efault
-       r[7] = "^capset\\(\\{0xbadc0ded /\\* _LINUX_CAPABILITY_VERSION_\\?\\?\\? \\*/, -1576685468\\}, " r_addr "\\) = " r_einval
-       r[8] = "^capset\\(\\{_LINUX_CAPABILITY_VERSION_2, 0\\}, " r_addr "\\) = " r_efault
-       s[9] = "capset({_LINUX_CAPABILITY_VERSION_3, 0}, " capset_data ") = -1 EPERM (Operation not permitted)"
-       s[10] = "capset({_LINUX_CAPABILITY_VERSION_3, 0}, " capset_v3hi_data ") = -1 EPERM (Operation not permitted)"
-       s[11] = "capset({_LINUX_CAPABILITY_VERSION_1, 0}, " capset_v1_data ") = -1 EPERM (Operation not permitted)"
+       r[7] = "^capset\\(\\{version=0xbadc0ded /\\* _LINUX_CAPABILITY_VERSION_\\?\\?\\? \\*/, pid=-1576685468\\}, " r_addr "\\) = " r_einval
+       r[8] = "^capset\\(\\{version=_LINUX_CAPABILITY_VERSION_2, pid=0\\}, " r_addr "\\) = " r_efault
+       s[9] = "capset({version=_LINUX_CAPABILITY_VERSION_3, pid=0}, " capset_data ") = -1 EPERM (Operation not permitted)"
+       s[10] = "capset({version=_LINUX_CAPABILITY_VERSION_3, pid=0}, " capset_v3hi_data ") = -1 EPERM (Operation not permitted)"
+       s[11] = "capset({version=_LINUX_CAPABILITY_VERSION_1, pid=0}, " capset_v1_data ") = -1 EPERM (Operation not permitted)"
        s[12] = "+++ exited with 0 +++"
 
        lines = 12