shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-27 01:57:35 +03:00
Code

analyze: teach "capability" verb JSON output too

Browse Source
This commit is contained in:
Lennart Poettering 2023-11-20 14:50:56 +01:00
parent fb8cc599ed
commit 81373a0e28
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/analyze/analyze-capability.c
View File

@ -46,11 +46,9 @@ int verb_capabilities(int argc, char *argv[], void *userdata) {
(void) table_set_sort(table, (size_t) 1); (void) table_set_sort(table, (size_t) 1);
} }
pager_open(arg_pager_flags); r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
r = table_print(table, NULL);
if (r < 0) if (r < 0)
return r; return log_error_errno(r, "Failed to output table: %m");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

4
src/analyze/analyze.c
View File

@ -558,9 +558,9 @@ static int parse_argv(int argc, char *argv[]) {
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Option --offline= is only supported for security right now."); "Option --offline= is only supported for security right now.");
if (arg_json_format_flags != JSON_FORMAT_OFF && !STRPTR_IN_SET(argv[optind], "security", "inspect-elf", "plot", "fdstore", "pcrs", "architectures")) if (arg_json_format_flags != JSON_FORMAT_OFF && !STRPTR_IN_SET(argv[optind], "security", "inspect-elf", "plot", "fdstore", "pcrs", "architectures", "capability"))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Option --json= is only supported for security, inspect-elf, plot, fdstore, pcrs, architectures right now."); "Option --json= is only supported for security, inspect-elf, plot, fdstore, pcrs, architectures, capability right now.");
if (arg_threshold != 100 && !streq_ptr(argv[optind], "security")) if (arg_threshold != 100 && !streq_ptr(argv[optind], "security"))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), return log_error_errno(SYNTHETIC_ERRNO(EINVAL),