X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-proxyd.c;h=45061ad80241e3a09e54048007a2c3bcf20aee34;hb=52cfc0379a9d63f99cdb3d9f63c839bbc8889b4c;hp=79f2f6e53c904ab1ef0663c9bc55d234db8dce8a;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 79f2f6e53..45061ad80 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -689,7 +689,6 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, Policy *polic } else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ListQueuedOwners")) { struct kdbus_cmd_name_list cmd = {}; struct kdbus_name_list *name_list; - struct kdbus_cmd_free cmd_free; struct kdbus_name_info *name; _cleanup_strv_free_ char **owners = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -742,10 +741,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, Policy *polic } } - cmd_free.flags = 0; - cmd_free.offset = cmd.offset; - - r = ioctl(a->input_fd, KDBUS_CMD_FREE, &cmd_free); + r = bus_kernel_cmd_free(a, cmd.offset); if (r < 0) return synthetic_reply_method_errno(m, r, NULL); @@ -1160,31 +1156,31 @@ static int process_hello(sd_bus *a, sd_bus *b, sd_bus_message *m, bool *got_hell r = sd_bus_message_new_method_return(m, &n); if (r < 0) { - log_error_errno(-r, "Failed to generate HELLO reply: %m"); + log_error_errno(r, "Failed to generate HELLO reply: %m"); return r; } r = sd_bus_message_append(n, "s", a->unique_name); if (r < 0) { - log_error_errno(-r, "Failed to append unique name to HELLO reply: %m"); + log_error_errno(r, "Failed to append unique name to HELLO reply: %m"); return r; } r = bus_message_append_sender(n, "org.freedesktop.DBus"); if (r < 0) { - log_error_errno(-r, "Failed to append sender to HELLO reply: %m"); + log_error_errno(r, "Failed to append sender to HELLO reply: %m"); return r; } r = bus_seal_synthetic_message(b, n); if (r < 0) { - log_error_errno(-r, "Failed to seal HELLO reply: %m"); + log_error_errno(r, "Failed to seal HELLO reply: %m"); return r; } r = sd_bus_send(b, n, NULL); if (r < 0) { - log_error_errno(-r, "Failed to send HELLO reply: %m"); + log_error_errno(r, "Failed to send HELLO reply: %m"); return r; } @@ -1196,31 +1192,31 @@ static int process_hello(sd_bus *a, sd_bus *b, sd_bus_message *m, bool *got_hell "org.freedesktop.DBus", "NameAcquired"); if (r < 0) { - log_error_errno(-r, "Failed to allocate initial NameAcquired message: %m"); + log_error_errno(r, "Failed to allocate initial NameAcquired message: %m"); return r; } r = sd_bus_message_append(n, "s", a->unique_name); if (r < 0) { - log_error_errno(-r, "Failed to append unique name to NameAcquired message: %m"); + log_error_errno(r, "Failed to append unique name to NameAcquired message: %m"); return r; } r = bus_message_append_sender(n, "org.freedesktop.DBus"); if (r < 0) { - log_error_errno(-r, "Failed to append sender to NameAcquired message: %m"); + log_error_errno(r, "Failed to append sender to NameAcquired message: %m"); return r; } r = bus_seal_synthetic_message(b, n); if (r < 0) { - log_error_errno(-r, "Failed to seal NameAcquired message: %m"); + log_error_errno(r, "Failed to seal NameAcquired message: %m"); return r; } r = sd_bus_send(b, n, NULL); if (r < 0) { - log_error_errno(-r, "Failed to send NameAcquired message: %m"); + log_error_errno(r, "Failed to send NameAcquired message: %m"); return r; } @@ -1305,7 +1301,7 @@ int main(int argc, char *argv[]) { r = get_user_creds(&user, &uid, &gid, NULL, NULL); if (r < 0) { - log_error_errno(-r, "Cannot resolve user name %s: %m", user); + log_error_errno(r, "Cannot resolve user name %s: %m", user); goto finish; } @@ -1322,31 +1318,31 @@ int main(int argc, char *argv[]) { r = sd_bus_new(&a); if (r < 0) { - log_error_errno(-r, "Failed to allocate bus: %m"); + log_error_errno(r, "Failed to allocate bus: %m"); goto finish; } r = sd_bus_set_description(a, "sd-proxy"); if (r < 0) { - log_error_errno(-r, "Failed to set bus name: %m"); + log_error_errno(r, "Failed to set bus name: %m"); goto finish; } r = sd_bus_set_address(a, arg_address); if (r < 0) { - log_error_errno(-r, "Failed to set address to connect to: %m"); + log_error_errno(r, "Failed to set address to connect to: %m"); goto finish; } r = sd_bus_negotiate_fds(a, is_unix); if (r < 0) { - log_error_errno(-r, "Failed to set FD negotiation: %m"); + log_error_errno(r, "Failed to set FD negotiation: %m"); goto finish; } r = sd_bus_negotiate_creds(a, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT); if (r < 0) { - log_error_errno(-r, "Failed to set credential negotiation: %m"); + log_error_errno(r, "Failed to set credential negotiation: %m"); goto finish; } @@ -1374,13 +1370,13 @@ int main(int argc, char *argv[]) { r = sd_bus_start(a); if (r < 0) { - log_error_errno(-r, "Failed to start bus client: %m"); + log_error_errno(r, "Failed to start bus client: %m"); goto finish; } r = sd_bus_get_owner_id(a, &server_id); if (r < 0) { - log_error_errno(-r, "Failed to get server ID: %m"); + log_error_errno(r, "Failed to get server ID: %m"); goto finish; } @@ -1390,13 +1386,13 @@ int main(int argc, char *argv[]) { r = sd_bus_get_owner_creds(a, SD_BUS_CREDS_UID, &bus_creds); if (r < 0) { - log_error_errno(-r, "Failed to get bus creds: %m"); + log_error_errno(r, "Failed to get bus creds: %m"); goto finish; } r = sd_bus_creds_get_uid(bus_creds, &bus_uid); if (r < 0) { - log_error_errno(-r, "Failed to get bus owner UID: %m"); + log_error_errno(r, "Failed to get bus owner UID: %m"); goto finish; } @@ -1406,7 +1402,7 @@ int main(int argc, char *argv[]) { r = policy_load(&policy_buffer, arg_configuration); if (r < 0) { - log_error_errno(-r, "Failed to load policy: %m"); + log_error_errno(r, "Failed to load policy: %m"); goto finish; } @@ -1423,37 +1419,37 @@ int main(int argc, char *argv[]) { r = sd_bus_new(&b); if (r < 0) { - log_error_errno(-r, "Failed to allocate bus: %m"); + log_error_errno(r, "Failed to allocate bus: %m"); goto finish; } r = sd_bus_set_fd(b, in_fd, out_fd); if (r < 0) { - log_error_errno(-r, "Failed to set fds: %m"); + log_error_errno(r, "Failed to set fds: %m"); goto finish; } r = sd_bus_set_server(b, 1, server_id); if (r < 0) { - log_error_errno(-r, "Failed to set server mode: %m"); + log_error_errno(r, "Failed to set server mode: %m"); goto finish; } r = sd_bus_negotiate_fds(b, is_unix); if (r < 0) { - log_error_errno(-r, "Failed to set FD negotiation: %m"); + log_error_errno(r, "Failed to set FD negotiation: %m"); goto finish; } r = sd_bus_negotiate_creds(b, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT); if (r < 0) { - log_error_errno(-r, "Failed to set credential negotiation: %m"); + log_error_errno(r, "Failed to set credential negotiation: %m"); goto finish; } r = sd_bus_set_anonymous(b, true); if (r < 0) { - log_error_errno(-r, "Failed to set anonymous authentication: %m"); + log_error_errno(r, "Failed to set anonymous authentication: %m"); goto finish; } @@ -1461,13 +1457,13 @@ int main(int argc, char *argv[]) { r = sd_bus_start(b); if (r < 0) { - log_error_errno(-r, "Failed to start bus client: %m"); + log_error_errno(r, "Failed to start bus client: %m"); goto finish; } r = rename_service(a, b); if (r < 0) - log_debug_errno(-r, "Failed to rename process: %m"); + log_debug_errno(r, "Failed to rename process: %m"); if (a->is_kernel) { _cleanup_free_ char *match = NULL; @@ -1475,7 +1471,7 @@ int main(int argc, char *argv[]) { r = sd_bus_get_unique_name(a, &unique); if (r < 0) { - log_error_errno(-r, "Failed to get unique name: %m"); + log_error_errno(r, "Failed to get unique name: %m"); goto finish; } @@ -1495,7 +1491,7 @@ int main(int argc, char *argv[]) { r = sd_bus_add_match(a, NULL, match, NULL, NULL); if (r < 0) { - log_error_errno(-r, "Failed to add match for NameLost: %m"); + log_error_errno(r, "Failed to add match for NameLost: %m"); goto finish; } @@ -1516,7 +1512,7 @@ int main(int argc, char *argv[]) { r = sd_bus_add_match(a, NULL, match, NULL, NULL); if (r < 0) { - log_error_errno(-r, "Failed to add match for NameAcquired: %m"); + log_error_errno(r, "Failed to add match for NameAcquired: %m"); goto finish; } } @@ -1538,7 +1534,7 @@ int main(int argc, char *argv[]) { if (r == -ECONNRESET) r = 0; else - log_error_errno(-r, "Failed to process bus a: %m"); + log_error_errno(r, "Failed to process bus a: %m"); goto finish; } @@ -1555,7 +1551,7 @@ int main(int argc, char *argv[]) { k = synthesize_name_acquired(a, b, m); if (k < 0) { r = k; - log_error_errno(-r, "Failed to synthesize message: %m"); + log_error_errno(r, "Failed to synthesize message: %m"); goto finish; } @@ -1565,7 +1561,7 @@ int main(int argc, char *argv[]) { k = process_policy(a, b, m, policy, &ucred, owned_names); if (k < 0) { r = k; - log_error_errno(-r, "Failed to process policy: %m"); + log_error_errno(r, "Failed to process policy: %m"); goto finish; } else if (k > 0) { r = 1; @@ -1580,7 +1576,7 @@ int main(int argc, char *argv[]) { r = 0; else { r = k; - log_error_errno(-r, "Failed to send message to client: %m"); + log_error_errno(r, "Failed to send message to client: %m"); } goto finish; @@ -1600,7 +1596,7 @@ int main(int argc, char *argv[]) { if (r == -ECONNRESET) r = 0; else - log_error_errno(-r, "Failed to process bus b: %m"); + log_error_errno(r, "Failed to process bus b: %m"); goto finish; } @@ -1617,7 +1613,7 @@ int main(int argc, char *argv[]) { k = process_hello(a, b, m, &got_hello); if (k < 0) { r = k; - log_error_errno(-r, "Failed to process HELLO: %m"); + log_error_errno(r, "Failed to process HELLO: %m"); goto finish; } else if (k > 0) { processed = true; @@ -1628,7 +1624,7 @@ int main(int argc, char *argv[]) { k = process_driver(a, b, m, policy, &ucred, owned_names); if (k < 0) { r = k; - log_error_errno(-r, "Failed to process driver calls: %m"); + log_error_errno(r, "Failed to process driver calls: %m"); goto finish; } else if (k > 0) { processed = true; @@ -1642,7 +1638,7 @@ int main(int argc, char *argv[]) { k = process_policy(b, a, m, policy, &ucred, owned_names); if (k < 0) { r = k; - log_error_errno(-r, "Failed to process policy: %m"); + log_error_errno(r, "Failed to process policy: %m"); goto finish; } else if (k > 0) { processed = true; @@ -1660,7 +1656,7 @@ int main(int argc, char *argv[]) { r = 0; else { r = k; - log_error_errno(-r, "Failed to send message to bus: %m"); + log_error_errno(r, "Failed to send message to bus: %m"); } goto finish; @@ -1678,31 +1674,31 @@ int main(int argc, char *argv[]) { fd = sd_bus_get_fd(a); if (fd < 0) { - log_error_errno(-r, "Failed to get fd: %m"); + log_error_errno(r, "Failed to get fd: %m"); goto finish; } events_a = sd_bus_get_events(a); if (events_a < 0) { - log_error_errno(-r, "Failed to get events mask: %m"); + log_error_errno(r, "Failed to get events mask: %m"); goto finish; } r = sd_bus_get_timeout(a, &timeout_a); if (r < 0) { - log_error_errno(-r, "Failed to get timeout: %m"); + log_error_errno(r, "Failed to get timeout: %m"); goto finish; } events_b = sd_bus_get_events(b); if (events_b < 0) { - log_error_errno(-r, "Failed to get events mask: %m"); + log_error_errno(r, "Failed to get events mask: %m"); goto finish; } r = sd_bus_get_timeout(b, &timeout_b); if (r < 0) { - log_error_errno(-r, "Failed to get timeout: %m"); + log_error_errno(r, "Failed to get timeout: %m"); goto finish; }