X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-proxyd.c;h=d10de2f6442054f8150f389e4da2aa876eb13ab6;hp=11d0e289cfcc9843a90dcd59597d9066a4a930f9;hb=455971c1493fc6dc3125d235cf4ea6102cac626d;hpb=056f95d0a70413e10e4a4ea9966baabb5a1450ed

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 11d0e289c..d10de2f64 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -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)
-                                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;
@@ -1166,12 +1166,7 @@ int main(int argc, char *argv[]) {
                 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);
         }
 
@@ -1197,7 +1192,7 @@ int main(int argc, char *argv[]) {
                 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;