bus: change API to expose "inverted" no_reply and no_auto_start message flags non...

[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 a14d7c822bab00722054a76f2f4db7d2ea365cef..ca2a2ab44de16cfc93885ad477a11891fbb783c0 100644 (file)
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -440,6 +440,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        r = sd_bus_set_name(a, "sd-proxy");
+        if (r < 0) {
+                log_error("Failed to set bus name: %s", strerror(-r));
+                goto finish;
+        }
+
         r = sd_bus_set_address(a, arg_address);
         if (r < 0) {
                 log_error("Failed to set address to connect to: %s", strerror(-r));
@@ -459,10 +465,11 @@ int main(int argc, char *argv[]) {
                 a->fake_creds_valid = true;
         }
 
-        if (peersec) {
-                a->fake_label = peersec;
-                peersec = NULL;
-        }
+        /* FIXME: faking security labels is broken in kdbus right now */
+        /* if (peersec) { */
+        /*         a->fake_label = peersec; */
+        /*         peersec = NULL; */
+        /* } */
 
         a->manual_peer_interface = true;
 
@@ -608,8 +615,13 @@ int main(int argc, char *argv[]) {
 
                                 k = sd_bus_send(b, m, NULL);
                                 if (k < 0) {
-                                        r = k;
-                                        log_error("Failed to send message: %s", strerror(-r));
+                                        if (k == -ECONNRESET)
+                                                r = 0;
+                                        else {
+                                                r = k;
+                                                log_error("Failed to send message: %s", strerror(-r));
+                                        }
+
                                         goto finish;
                                 }
                         }
@@ -639,6 +651,7 @@ int main(int argc, char *argv[]) {
                         k = process_hello(a, b, m, &got_hello);
                         if (k < 0) {
                                 r = k;
+                                log_error("Failed to process HELLO: %s", strerror(-r));
                                 goto finish;
                         }
 
@@ -648,13 +661,19 @@ int main(int argc, char *argv[]) {
                                 k = process_policy(a, b, m);
                                 if (k < 0) {
                                         r = k;
+                                        log_error("Failed to process policy: %s", strerror(-r));
                                         goto finish;
                                 }
 
                                 k = sd_bus_send(a, m, NULL);
                                 if (k < 0) {
-                                        r = k;
-                                        log_error("Failed to send message: %s", strerror(-r));
+                                        if (r == -ECONNRESET)
+                                                r = 0;
+                                        else {
+                                                r = k;
+                                                log_error("Failed to send message: %s", strerror(-r));
+                                        }
+
                                         goto finish;
                                 }
                         }