summaryrefslogtreecommitdiffstats
path: root/src/bus-proxyd
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-04 17:24:30 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-04 18:09:19 +0100
commitf7fce3454c221fd1fff51528d028576d1cb1c7b6 (patch)
treeb6c1537aa357efe1575d99ebba1eec1ea6b57dce /src/bus-proxyd
parentsd-bus,sd-event: unify error handling of object descriptions (diff)
downloadsystemd-f7fce3454c221fd1fff51528d028576d1cb1c7b6.tar.xz
systemd-f7fce3454c221fd1fff51528d028576d1cb1c7b6.zip
sd-bus: rename sd_bus_get_server_id() to sd_bus_get_owner_id()
In kdbus a "server id" is mostly a misnomer, as there isn't any "server" involved anymore. Let's rename this to "owner" id hence, since it is an ID that is picked by the owner of a bus or direct connection. This matches nicely the sd_bus_get_owner_creds() call we already have.
Diffstat (limited to 'src/bus-proxyd')
-rw-r--r--src/bus-proxyd/bus-proxyd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index d10de2f644..88346edeef 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -676,7 +676,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
sd_id128_t server_id;
char buf[SD_ID128_STRING_MAX];
- r = sd_bus_get_server_id(a, &server_id);
+ r = sd_bus_get_owner_id(a, &server_id);
if (r < 0)
return synthetic_reply_method_errno(m, r, NULL);
@@ -1230,7 +1230,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- r = sd_bus_get_server_id(a, &server_id);
+ r = sd_bus_get_owner_id(a, &server_id);
if (r < 0) {
log_error("Failed to get server ID: %s", strerror(-r));
goto finish;