X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fbus-util.c;h=64c389b356738e4729bb534f40d9d540dbbb2035;hp=d408e70ebc54845ab4b3de2c3875e03d94fb8a19;hb=98d5c9dbd0d47bc1c91dd54514d316cc1c590b05;hpb=1cfc78c91965df340cdde100ad6cb3ed50b28927 diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index d408e70eb..64c389b35 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -93,6 +93,8 @@ int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name) { return 0; } +/// UNNEEDED by elogind +#if 0 int bus_event_loop_with_idle( sd_event *e, sd_bus *bus, @@ -165,6 +167,7 @@ int bus_event_loop_with_idle( return code; } +#endif // 0 int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error) { _cleanup_bus_message_unref_ sd_bus_message *rep = NULL; @@ -220,6 +223,7 @@ int bus_test_polkit( sd_bus_message *call, int capability, const char *action, + const char **details, uid_t good_user, bool *_challenge, sd_bus_error *e) { @@ -242,29 +246,52 @@ int bus_test_polkit( return 1; #ifdef ENABLE_POLKIT else { + _cleanup_bus_message_unref_ sd_bus_message *request = NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; int authorized = false, challenge = false; - const char *sender; + const char *sender, **k, **v; sender = sd_bus_message_get_sender(call); if (!sender) return -EBADMSG; - r = sd_bus_call_method( + r = sd_bus_message_new_method_call( call->bus, + &request, "org.freedesktop.PolicyKit1", "/org/freedesktop/PolicyKit1/Authority", "org.freedesktop.PolicyKit1.Authority", - "CheckAuthorization", - e, - &reply, - "(sa{sv})sa{ss}us", + "CheckAuthorization"); + if (r < 0) + return r; + + r = sd_bus_message_append( + request, + "(sa{sv})s", "system-bus-name", 1, "name", "s", sender, - action, - 0, - 0, - ""); + action); + if (r < 0) + return r; + + r = sd_bus_message_open_container(request, 'a', "{ss}"); + if (r < 0) + return r; + + STRV_FOREACH_PAIR(k, v, details) { + r = sd_bus_message_append(request, "{ss}", *k, *v); + if (r < 0) + return r; + } + r = sd_bus_message_close_container(request); + if (r < 0) + return r; + + r = sd_bus_message_append(request, "us", 0, NULL); + if (r < 0) + return r; + + r = sd_bus_call(call->bus, request, 0, e, &reply); if (r < 0) { /* Treat no PK available as access denied */ if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN)) { @@ -354,6 +381,7 @@ int bus_verify_polkit_async( sd_bus_message *call, int capability, const char *action, + const char **details, bool interactive, uid_t good_user, Hashmap **registry, @@ -362,7 +390,7 @@ int bus_verify_polkit_async( #ifdef ENABLE_POLKIT _cleanup_bus_message_unref_ sd_bus_message *pk = NULL; AsyncPolkitQuery *q; - const char *sender; + const char *sender, **k, **v; sd_bus_message_handler_t callback; void *userdata; int c; @@ -460,12 +488,27 @@ int bus_verify_polkit_async( r = sd_bus_message_append( pk, - "(sa{sv})sa{ss}us", + "(sa{sv})s", "system-bus-name", 1, "name", "s", sender, - action, - 0, - !!interactive, - NULL); + action); + if (r < 0) + return r; + + r = sd_bus_message_open_container(pk, 'a', "{ss}"); + if (r < 0) + return r; + + STRV_FOREACH_PAIR(k, v, details) { + r = sd_bus_message_append(pk, "{ss}", *k, *v); + if (r < 0) + return r; + } + + r = sd_bus_message_close_container(pk); + if (r < 0) + return r; + + r = sd_bus_message_append(pk, "us", !!interactive, NULL); if (r < 0) return r; @@ -1100,6 +1143,8 @@ int bus_message_map_all_properties( return sd_bus_message_exit_container(m); } +/// UNNEEDED by elogind +#if 0 int bus_message_map_properties_changed( sd_bus_message *m, const struct bus_properties_map *map, @@ -1135,6 +1180,7 @@ int bus_message_map_properties_changed( return invalidated; } +#endif // 0 int bus_map_all_properties( sd_bus *bus, @@ -1202,6 +1248,8 @@ int bus_open_transport(BusTransport transport, const char *host, bool user, sd_b return r; } +/// UNNEEDED by elogind +#if 0 int bus_open_transport_systemd(BusTransport transport, const char *host, bool user, sd_bus **bus) { int r; @@ -1236,6 +1284,7 @@ int bus_open_transport_systemd(BusTransport transport, const char *host, bool us return r; } +#endif // 0 int bus_property_get_bool( sd_bus *bus, @@ -1305,6 +1354,8 @@ int bus_log_create_error(int r) { return log_error_errno(r, "Failed to create bus message: %m"); } +/// UNNEEDED by elogind +#if 0 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { assert(message); assert(u); @@ -1382,7 +1433,8 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen if (STR_IN_SET(field, "CPUAccounting", "MemoryAccounting", "BlockIOAccounting", - "SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies")) { + "SendSIGHUP", "SendSIGKILL", "WakeSystem", "DefaultDependencies", + "IgnoreSIGPIPE", "TTYVHangup", "TTYReset", "RemainAfterExit")) { r = parse_boolean(eq); if (r < 0) { @@ -1414,7 +1466,11 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen r = sd_bus_message_append(m, "v", "t", u); - } else if (STR_IN_SET(field, "User", "Group", "DevicePolicy", "KillMode")) + } else if (STR_IN_SET(field, + "User", "Group", "DevicePolicy", "KillMode", + "UtmpIdentifier", "UtmpMode", "PAMName", "TTYPath", + "StandardInput", "StandardOutput", "StandardError", + "Description", "Slice", "Type")) r = sd_bus_message_append(m, "v", "s", eq); else if (streq(field, "DeviceAllow")) { @@ -1564,6 +1620,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen return 0; } +#endif // 0 typedef struct BusWaitForJobs { sd_bus *bus; @@ -1576,6 +1633,8 @@ typedef struct BusWaitForJobs { sd_bus_slot *slot_disconnected; } BusWaitForJobs; +/// UNNEEDED by elogind +#if 0 static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *error) { assert(m); @@ -1615,6 +1674,7 @@ static int match_job_removed(sd_bus_message *m, void *userdata, sd_bus_error *er return 0; } +#endif // 0 void bus_wait_for_jobs_free(BusWaitForJobs *d) { if (!d) @@ -1633,6 +1693,8 @@ void bus_wait_for_jobs_free(BusWaitForJobs *d) { free(d); } +/// UNNEEDED by elogind +#if 0 int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret) { _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *d = NULL; int r; @@ -1682,6 +1744,7 @@ int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret) { return 0; } +#endif // 0 static int bus_process_wait(sd_bus *bus) { int r; @@ -2021,8 +2084,6 @@ int bus_path_decode_unique(const char *path, const char *prefix, char **ret_send return 1; } -/// UNNEEDED by elogind -#if 0 bool is_kdbus_wanted(void) { _cleanup_free_ char *value = NULL; #ifdef ENABLE_KDBUS @@ -2056,4 +2117,3 @@ bool is_kdbus_available(void) { return ioctl(fd, KDBUS_CMD_BUS_MAKE, &cmd) >= 0; } -#endif // 0