diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2021-05-14 14:14:25 +0200 |
|---|---|---|
| committer | Christian Göttsche <cgzones@googlemail.com> | 2021-05-14 16:53:04 +0200 |
| commit | 57e70396dfdc6835c4a9141d29043e4af407205d (patch) | |
| tree | e49e170a5034c5eec81a72c1f1ad54928b06d589 /src | |
| parent | selinux: reload label db on policy load with libselinux 3.2 (diff) | |
| download | systemd-57e70396dfdc6835c4a9141d29043e4af407205d.tar.xz systemd-57e70396dfdc6835c4a9141d29043e4af407205d.zip | |
selinux: invoke selinux_set_callback(3) more type-safe
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/selinux-access.c | 4 | ||||
| -rw-r--r-- | src/core/selinux-setup.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c index cdb82dd894..d077d5dea7 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -162,8 +162,8 @@ static int access_init(sd_bus_error *error) { return sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to open the SELinux AVC: %s", strerror_safe(saved_errno)); } - selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback) audit_callback); - selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback) log_callback); + selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback) { .func_audit = audit_callback }); + selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback) { .func_log = log_callback }); initialized = true; return 1; diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c index 1ac05b81e8..2bafbee3eb 100644 --- a/src/core/selinux-setup.c +++ b/src/core/selinux-setup.c @@ -30,16 +30,12 @@ int mac_selinux_setup(bool *loaded_policy) { usec_t before_load, after_load; char *con; int r; - static const union selinux_callback cb = { - .func_log = null_log, - }; - bool initialized = false; assert(loaded_policy); /* Turn off all of SELinux' own logging, we want to do that */ - selinux_set_callback(SELINUX_CB_LOG, cb); + selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback) { .func_log = null_log }); /* Don't load policy in the initrd if we don't appear to have * it. For the real root, we check below if we've already |