X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-socket.c;h=a449ce0eb3aa65d1877bac08336c6359169cb8ff;hb=5f7e8903b275f14d0f41f0542871d09deccb1741;hp=d7d3b4dac5aa2bea3c4b21e40de7f3edc4fb5423;hpb=7adc46fcce257fcf4c83faa18b8c78f2a577e4f1;p=elogind.git

diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd-bus/bus-socket.c
index d7d3b4dac..a449ce0eb 100644
--- a/src/libsystemd-bus/bus-socket.c
+++ b/src/libsystemd-bus/bus-socket.c
@@ -623,6 +623,9 @@ int bus_socket_setup(sd_bus *b) {
         if (getsockopt(b->input_fd, SOL_SOCKET, SO_PEERCRED, &b->ucred, &l) >= 0 && l >= sizeof(b->ucred))
                 b->ucred_valid = b->ucred.pid > 0;
 
+        b->is_kernel = false;
+        b->message_version = 1;
+
         return 0;
 }
 
@@ -765,6 +768,10 @@ int bus_socket_exec(sd_bus *b) {
         close_nointr_nofail(s[1]);
         b->output_fd = b->input_fd = s[0];
 
+        r = bus_socket_setup(b);
+        if (r < 0)
+                return r;
+
         return bus_socket_start_auth(b);
 }
 
@@ -874,10 +881,10 @@ static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
         b = ((const uint32_t*) bus->rbuffer)[3];
 
         e = ((const uint8_t*) bus->rbuffer)[0];
-        if (e == SD_BUS_LITTLE_ENDIAN) {
+        if (e == BUS_LITTLE_ENDIAN) {
                 a = le32toh(a);
                 b = le32toh(b);
-        } else if (e == SD_BUS_BIG_ENDIAN) {
+        } else if (e == BUS_BIG_ENDIAN) {
                 a = be32toh(a);
                 b = be32toh(b);
         } else