X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-proxyd.c;h=9937159fcba98420666265e5402949983cfa31b8;hb=bcf3295d2b0d87caefad2e73d221aac080d0c11e;hp=98b2ffd7d1c33230e59da322359c45d44bec40f1;hpb=827bf3c5dd88c51080de159e071fcbe7ada3477c;p=elogind.git diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 98b2ffd7d..9937159fc 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -45,6 +45,7 @@ #include "strv.h" #include "def.h" #include "capability.h" +#include "bus-policy.h" static const char *arg_address = DEFAULT_SYSTEM_BUS_PATH; static char *arg_command_line_buffer = NULL; @@ -1043,6 +1044,7 @@ int main(int argc, char *argv[]) { bool is_unix; struct ucred ucred = {}; _cleanup_free_ char *peersec = NULL; + Policy policy = {}; log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); log_parse_environment(); @@ -1052,6 +1054,14 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; + r = policy_load(&policy); + if (r < 0) { + log_error("Failed to load policy: %s", strerror(-r)); + goto finish; + } + + /* policy_dump(&policy); */ + r = sd_listen_fds(0); if (r == 0) { in_fd = STDIN_FILENO; @@ -1414,5 +1424,7 @@ finish: sd_bus_flush(a); sd_bus_flush(b); + policy_free(&policy); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }