diff options
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/libsystemd.sym.m4 | 6 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c | 12 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-convenience.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-track.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/busctl.c | 6 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4 index 87da7ac021..ab11448bb9 100644 --- a/src/libsystemd/libsystemd.sym.m4 +++ b/src/libsystemd/libsystemd.sym.m4 @@ -191,7 +191,7 @@ global: sd_bus_is_open; sd_bus_can_send; sd_bus_get_server_id; - sd_bus_get_peer_creds; + sd_bus_get_owner_creds; sd_bus_get_name; sd_bus_send; sd_bus_send_to; @@ -287,8 +287,8 @@ global: sd_bus_request_name; sd_bus_release_name; sd_bus_list_names; - sd_bus_get_owner; - sd_bus_get_owner_machine_id; + sd_bus_get_name_creds; + sd_bus_get_name_machine_id; sd_bus_call_method; sd_bus_get_property; sd_bus_get_property_trivial; diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index b66606763d..96f59f9b36 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -549,7 +549,7 @@ static int bus_populate_creds_from_items(sd_bus *bus, return 0; } -static int bus_get_owner_kdbus( +static int bus_get_name_creds_kdbus( sd_bus *bus, const char *name, uint64_t mask, @@ -627,7 +627,7 @@ fail: return r; } -static int bus_get_owner_dbus1( +static int bus_get_name_creds_dbus1( sd_bus *bus, const char *name, uint64_t mask, @@ -773,7 +773,7 @@ static int bus_get_owner_dbus1( return 0; } -_public_ int sd_bus_get_owner( +_public_ int sd_bus_get_name_creds( sd_bus *bus, const char *name, uint64_t mask, @@ -791,9 +791,9 @@ _public_ int sd_bus_get_owner( return -ENOTCONN; if (bus->is_kernel) - return bus_get_owner_kdbus(bus, name, mask, creds); + return bus_get_name_creds_kdbus(bus, name, mask, creds); else - return bus_get_owner_dbus1(bus, name, mask, creds); + return bus_get_name_creds_dbus1(bus, name, mask, creds); } static int add_name_change_match(sd_bus *bus, @@ -1245,7 +1245,7 @@ int bus_remove_match_internal( return bus_remove_match_internal_dbus1(bus, match); } -_public_ int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { +_public_ int sd_bus_get_name_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL, *m = NULL; const char *mid; int r; diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c index f88836b884..8081a2f9c0 100644 --- a/src/libsystemd/sd-bus/bus-convenience.c +++ b/src/libsystemd/sd-bus/bus-convenience.c @@ -465,9 +465,9 @@ _public_ int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_b * to get it from the sender or peer */ if (call->sender) - return sd_bus_get_owner(call->bus, call->sender, mask, creds); + return sd_bus_get_name_creds(call->bus, call->sender, mask, creds); else - return sd_bus_get_peer_creds(call->bus, mask, creds); + return sd_bus_get_owner_creds(call->bus, mask, creds); } return bus_creds_extend_by_pid(c, mask, creds); diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c index 4b6a8bfee9..f3b593d2b8 100644 --- a/src/libsystemd/sd-bus/bus-track.c +++ b/src/libsystemd/sd-bus/bus-track.c @@ -188,7 +188,7 @@ _public_ int sd_bus_track_add_name(sd_bus_track *track, const char *name) { /* Second, check if it is currently existing, or maybe * doesn't, or maybe disappeared already. */ - r = sd_bus_get_owner(track->bus, n, 0, NULL); + r = sd_bus_get_name_creds(track->bus, n, 0, NULL); if (r < 0) { hashmap_remove(track->names, n); return r; diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c index f06b74505b..fdc275ce46 100644 --- a/src/libsystemd/sd-bus/busctl.c +++ b/src/libsystemd/sd-bus/busctl.c @@ -142,7 +142,7 @@ static int list_bus_names(sd_bus *bus, char **argv) { printf("%-*s", (int) max_i, *i); - r = sd_bus_get_owner(bus, *i, + r = sd_bus_get_name_creds(bus, *i, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM| SD_BUS_CREDS_UNIQUE_NAME|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_SESSION| SD_BUS_CREDS_CONNECTION_NAME, &creds); @@ -210,7 +210,7 @@ static int list_bus_names(sd_bus *bus, char **argv) { printf(" - - - - - - - "); if (arg_show_machine) { - r = sd_bus_get_owner_machine_id(bus, *i, &mid); + r = sd_bus_get_name_machine_id(bus, *i, &mid); if (r >= 0) { char m[SD_ID128_STRING_MAX]; printf(" %s\n", sd_id128_to_string(mid, m)); @@ -306,7 +306,7 @@ static int status(sd_bus *bus, char *argv[]) { r = parse_pid(argv[1], &pid); if (r < 0) - r = sd_bus_get_owner(bus, argv[1], _SD_BUS_CREDS_ALL, &creds); + r = sd_bus_get_name_creds(bus, argv[1], _SD_BUS_CREDS_ALL, &creds); else r = sd_bus_creds_new_from_pid(&creds, pid, _SD_BUS_CREDS_ALL); diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 549f9e0943..9ec15658df 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3300,7 +3300,7 @@ _public_ int sd_bus_path_decode(const char *path, const char *prefix, char **ext return 1; } -_public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) { +_public_ int sd_bus_get_owner_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **ret) { sd_bus_creds *c; pid_t pid = 0; int r; |