diff options
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/libsystemd.sym.m4 | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 6 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-chat.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4 index 635caf696b..0c02db7530 100644 --- a/src/libsystemd/libsystemd.sym.m4 +++ b/src/libsystemd/libsystemd.sym.m4 @@ -190,7 +190,7 @@ global: sd_bus_unref; sd_bus_is_open; sd_bus_can_send; - sd_bus_get_server_id; + sd_bus_get_owner_id; sd_bus_get_owner_creds; sd_bus_get_description; sd_bus_send; diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index a3165fb4f7..e6b47f7fd8 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -1412,18 +1412,18 @@ _public_ int sd_bus_can_send(sd_bus *bus, char type) { return bus_type_is_valid(type); } -_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) { +_public_ int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id) { int r; assert_return(bus, -EINVAL); - assert_return(server_id, -EINVAL); + assert_return(id, -EINVAL); assert_return(!bus_pid_changed(bus), -ECHILD); r = bus_ensure_running(bus); if (r < 0) return r; - *server_id = bus->server_id; + *id = bus->server_id; return 0; } diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index d5903f41d5..8ee66cfcda 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -78,7 +78,7 @@ static int server_init(sd_bus **_bus) { goto fail; } - r = sd_bus_get_server_id(bus, &id); + r = sd_bus_get_owner_id(bus, &id); if (r < 0) { log_error("Failed to get server ID: %s", strerror(-r)); goto fail; |