X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fsd-bus.c;h=c7511c32d2ee648d2d129222683cd89ca28be11a;hb=d8d3d8a781031d6b1ee4e5f57ec21f16c20a4cf2;hp=29487cbd317904f545b27b570c7ea5712695b55c;hpb=6629161f827c82889cf45cfcdce62dcb543eda23;p=elogind.git

diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
index 29487cbd3..c7511c32d 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -31,6 +31,7 @@
 #include "macro.h"
 #include "strv.h"
 #include "set.h"
+#include "missing.h"
 
 #include "sd-bus.h"
 #include "bus-internal.h"
@@ -55,6 +56,7 @@ static void bus_free(sd_bus *b) {
         free(b->unique_name);
         free(b->auth_buffer);
         free(b->address);
+        free(b->kernel);
 
         free(b->exec_path);
         strv_free(b->exec_argv);
@@ -279,7 +281,7 @@ static int bus_send_hello(sd_bus *bus) {
 int bus_start_running(sd_bus *bus) {
         assert(bus);
 
-        if (bus->bus_client) {
+        if (bus->bus_client && !bus->is_kernel) {
                 bus->state = BUS_HELLO;
                 return 1;
         }
@@ -840,7 +842,7 @@ int sd_bus_open_system(sd_bus **ret) {
         if (r < 0)
                 return r;
 
-        e = getenv("DBUS_SYSTEM_BUS_ADDRESS");
+        e = secure_getenv("DBUS_SYSTEM_BUS_ADDRESS");
         if (e) {
                 r = sd_bus_set_address(b, e);
                 if (r < 0)
@@ -878,13 +880,13 @@ int sd_bus_open_user(sd_bus **ret) {
         if (r < 0)
                 return r;
 
-        e = getenv("DBUS_SESSION_BUS_ADDRESS");
+        e = secure_getenv("DBUS_SESSION_BUS_ADDRESS");
         if (e) {
                 r = sd_bus_set_address(b, e);
                 if (r < 0)
                         goto fail;
         } else {
-                e = getenv("XDG_RUNTIME_DIR");
+                e = secure_getenv("XDG_RUNTIME_DIR");
                 if (!e) {
                         r = -ENOENT;
                         goto fail;
@@ -1583,6 +1585,10 @@ static int process_reply(sd_bus *bus, sd_bus_message *m) {
         if (c->timeout != 0)
                 prioq_remove(bus->reply_callbacks_prioq, c, &c->prioq_idx);
 
+        r = sd_bus_message_rewind(m, true);
+        if (r < 0)
+                return r;
+
         r = c->callback(bus, 0, m, c->userdata);
         free(c);
 
@@ -1610,6 +1616,10 @@ static int process_filter(sd_bus *bus, sd_bus_message *m) {
 
                         l->last_iteration = bus->iteration_counter;
 
+                        r = sd_bus_message_rewind(m, true);
+                        if (r < 0)
+                                return r;
+
                         r = l->callback(bus, 0, m, l->userdata);
                         if (r != 0)
                                 return r;
@@ -1719,6 +1729,10 @@ static int process_object(sd_bus *bus, sd_bus_message *m) {
 
                         c->last_iteration = bus->iteration_counter;
 
+                        r = sd_bus_message_rewind(m, true);
+                        if (r < 0)
+                                return r;
+
                         r = c->callback(bus, 0, m, c->userdata);
                         if (r != 0)
                                 return r;
@@ -1745,6 +1759,10 @@ static int process_object(sd_bus *bus, sd_bus_message *m) {
 
                                 c->last_iteration = bus->iteration_counter;
 
+                                r = sd_bus_message_rewind(m, true);
+                                if (r < 0)
+                                        return r;
+
                                 r = c->callback(bus, 0, m, c->userdata);
                                 if (r != 0)
                                         return r;
@@ -1929,6 +1947,10 @@ static int process_running(sd_bus *bus, sd_bus_message **ret) {
                 goto null_message;
 
         if (ret) {
+                r = sd_bus_message_rewind(m, true);
+                if (r < 0)
+                        return r;
+
                 *ret = m;
                 m = NULL;
                 return 1;