diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-12-12 18:37:25 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-12-12 18:37:25 +0100 |
| commit | 34a3e4ecad5fd2042eb83ffcbf30379a536cc3ee (patch) | |
| tree | 6006de7db363836737e4ceff908b333789075d02 | |
| parent | 98cd2651988619bf606f0b27825440c4638a7e0b (diff) | |
cap-list: return lower-case capability names, similar to libcap's cap_to_name(), for compat reasons
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/test/test-cap-list.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 417074945f..4545cfebeb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1252,7 +1252,7 @@ src/shared/cap-list.txt: $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@ src/shared/cap-to-name.h: src/shared/cap-list.txt - $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@ src/shared/cap-from-name.gperf: src/shared/cap-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c index dfa9a063c2..a536522646 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-cap-list.c @@ -39,6 +39,8 @@ int main(int argc, char *argv[]) { assert_se(capability_from_name("asdfbsd") == -EINVAL); assert_se(capability_from_name("CAP_AUDIT_READ") == CAP_AUDIT_READ); + assert_se(capability_from_name("cap_audit_read") == CAP_AUDIT_READ); + assert_se(capability_from_name("cAp_aUdIt_rEAd") == CAP_AUDIT_READ); assert_se(capability_from_name("0") == 0); assert_se(capability_from_name("15") == 15); assert_se(capability_from_name("-1") == -EINVAL); |