1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00

bpf-firewall: invert test

Following our coding style of exiting early (instead of deep nesting),
let's invert the if check here.

Inspired by: https://github.com/systemd/systemd/pull/21602#pullrequestreview-919960060
This commit is contained in:
Lennart Poettering 2022-03-24 10:46:40 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent bbd2620022
commit d01133125c

View File

@ -927,16 +927,17 @@ void emit_bpf_firewall_warning(Unit *u) {
assert(u); assert(u);
assert(u->manager); assert(u->manager);
if (!warned && !MANAGER_IS_TEST_RUN(u->manager)) { if (warned || MANAGER_IS_TEST_RUN(u->manager))
bool quiet = bpf_firewall_unsupported_reason == -EPERM && detect_container() > 0; return;
log_unit_full_errno(u, quiet ? LOG_DEBUG : LOG_WARNING, bpf_firewall_unsupported_reason, bool quiet = ERRNO_IS_PRIVILEGE(bpf_firewall_unsupported_reason) && detect_container() > 0;
"unit configures an IP firewall, but %s.\n"
"(This warning is only shown for the first unit using IP firewalling.)", log_unit_full_errno(u, quiet ? LOG_DEBUG : LOG_WARNING, bpf_firewall_unsupported_reason,
getuid() != 0 ? "not running as root" : "unit configures an IP firewall, but %s.\n"
"the local system does not support BPF/cgroup firewalling"); "(This warning is only shown for the first unit using IP firewalling.)",
warned = true; getuid() != 0 ? "not running as root" :
} "the local system does not support BPF/cgroup firewalling");
warned = true;
} }
void bpf_firewall_close(Unit *u) { void bpf_firewall_close(Unit *u) {