SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: port various places to read_boolean_file()

Browse Source
This commit is contained in:
Lennart Poettering
2026-05-11 12:04:02 +02:00
parent db8046535b
commit 4f63cff1f4
3 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/apparmor-util.c
+3 -10
View File
@@ -9,9 +9,7 @@
#include "sd-dlopen.h"
#include "alloc-util.h"
#include "fileio.h"
#include "parse-util.h"
static void *libapparmor_dl = NULL;
@@ -31,18 +29,13 @@ bool mac_apparmor_use(void) {
if (cached_use >= 0)
return cached_use;
_cleanup_free_ char *p = NULL;
r = read_one_line_file("/sys/module/apparmor/parameters/enabled", &p);
r = read_boolean_file("/sys/module/apparmor/parameters/enabled");
if (r < 0) {
if (r != -ENOENT)
log_debug_errno(r, "Failed to read /sys/module/apparmor/parameters/enabled, assuming AppArmor is not available: %m");
log_debug_errno(r, "Failed to read and parse /sys/module/apparmor/parameters/enabled, assuming AppArmor is not available: %m");
return (cached_use = false);
}
r = parse_boolean(p);
if (r < 0)
log_debug_errno(r, "Failed to parse /sys/module/apparmor/parameters/enabled, assuming AppArmor is not available: %m");
if (r <= 0)
if (r == 0)
return (cached_use = false);
if (dlopen_libapparmor(LOG_DEBUG) < 0)