chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: rename sd_bus_get_server_id() to sd_bus_get_owner_id()
[elogind.git]
/
src
/
bus-proxyd
/
bus-proxyd.c
diff --git
a/src/bus-proxyd/bus-proxyd.c
b/src/bus-proxyd/bus-proxyd.c
index 11d0e289cfcc9843a90dcd59597d9066a4a930f9..88346edeef87fe4a9a5fd1a17b04907ab23b5af4 100644
(file)
--- 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];
sd_id128_t server_id;
char buf[SD_ID128_STRING_MAX];
- r = sd_bus_get_
serv
er_id(a, &server_id);
+ r = sd_bus_get_
own
er_id(a, &server_id);
if (r < 0)
return synthetic_reply_method_errno(m, r, NULL);
if (r < 0)
return synthetic_reply_method_errno(m, r, NULL);
@@
-768,8
+768,8
@@
static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
char *n;
KDBUS_ITEM_FOREACH(item, name, items)
char *n;
KDBUS_ITEM_FOREACH(item, name, items)
- if (item->type == KDBUS_ITEM_NAME)
- entry_name = item->
str
;
+ if (item->type == KDBUS_ITEM_
OWNED_
NAME)
+ entry_name = item->
name.name
;
if (!streq_ptr(entry_name, arg0))
continue;
if (!streq_ptr(entry_name, arg0))
continue;
@@
-1166,12
+1166,7
@@
int main(int argc, char *argv[]) {
sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0;
if (is_unix) {
sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0;
if (is_unix) {
- r = getpeercred(in_fd, &ucred);
- if (r < 0) {
- log_error("Failed to get peer creds: %s", strerror(-r));
- goto finish;
- }
-
+ (void) getpeercred(in_fd, &ucred);
(void) getpeersec(in_fd, &peersec);
}
(void) getpeersec(in_fd, &peersec);
}
@@
-1197,7
+1192,7
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- r = sd_bus_set_
name
(a, "sd-proxy");
+ r = sd_bus_set_
description
(a, "sd-proxy");
if (r < 0) {
log_error("Failed to set bus name: %s", strerror(-r));
goto finish;
if (r < 0) {
log_error("Failed to set bus name: %s", strerror(-r));
goto finish;
@@
-1235,7
+1230,7
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- r = sd_bus_get_
serv
er_id(a, &server_id);
+ r = sd_bus_get_
own
er_id(a, &server_id);
if (r < 0) {
log_error("Failed to get server ID: %s", strerror(-r));
goto finish;
if (r < 0) {
log_error("Failed to get server ID: %s", strerror(-r));
goto finish;