manager: rename dbus method

Fixes #24989.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-10-14 18:31:33 +02:00
parent f6e88aac2c
commit 293b9aa3eb
4 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -36,7 +36,7 @@ static int dump_patterns(sd_bus *bus, char **patterns) {
const char *text;
int r;
r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "DumpPatterns");
r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "DumpUnitsMatchingPatterns");
if (r < 0)
return bus_log_create_error(r);
@@ -58,7 +58,7 @@ static int dump_patterns(sd_bus *bus, char **patterns) {
r = sd_bus_call(bus, m, 0, &error, &reply);
if (r < 0)
return log_error_errno(r, "Failed to issue method call DumpPatterns: %s",
return log_error_errno(r, "Failed to issue method call DumpUnitsMatchingPatterns: %s",
bus_error_message(&error, r));
r = sd_bus_message_read(reply, "s", &text);
+3 -3
View File
@@ -1392,7 +1392,7 @@ static int method_dump_by_fd(sd_bus_message *message, void *userdata, sd_bus_err
return dump_impl(message, userdata, error, NULL, reply_dump_by_fd);
}
static int method_dump_patterns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
static int method_dump_units_matching_patterns(sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_strv_free_ char **patterns = NULL;
int r;
@@ -3027,10 +3027,10 @@ const sd_bus_vtable bus_manager_vtable[] = {
SD_BUS_RESULT("s", output),
method_dump,
SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD_WITH_ARGS("DumpPatterns",
SD_BUS_METHOD_WITH_ARGS("DumpUnitsMatchingPatterns",
SD_BUS_ARGS("as", patterns),
SD_BUS_RESULT("s", output),
method_dump_patterns,
method_dump_units_matching_patterns,
SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD_WITH_ARGS("DumpByFileDescriptor",
SD_BUS_NO_ARGS,
+1 -1
View File
@@ -122,7 +122,7 @@
<allow send_destination="org.freedesktop.systemd1"
send_interface="org.freedesktop.systemd1.Manager"
send_member="DumpPatterns"/>
send_member="DumpUnitsMatchingPatterns"/>
<allow send_destination="org.freedesktop.systemd1"
send_interface="org.freedesktop.systemd1.Manager"