[systemd-commits] src/libsystemd

[Kay Sievers]

 src/libsystemd/sd-bus/bus-kernel.c |    1 -
 src/libsystemd/sd-bus/kdbus.h      |    9 +++------
 src/libsystemd/sd-bus/sd-bus.c     |    2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit c32195e057e5bf903c2645e273ba82f32c0106d3
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri Oct 17 10:09:14 2014 +0200

    Revert "sd-bus: sync kdbus.h (ABI break)"
    
    This reverts commit 1a2409e262da65a4b0ca8ab18fcf5eabd2d404ca.
    
    Support from the kdbus interface was removed. We require
    memfds to be supported by all clients.

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 27899c1..c3dbc83 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1566,7 +1566,6 @@ int bus_kernel_make_starter(
 
         hello->size = size;
         hello->conn_flags =
-                KDBUS_HELLO_ACCEPT_MEMFD |
                 (activating ? KDBUS_HELLO_ACTIVATOR : KDBUS_HELLO_POLICY_HOLDER) |
                 (accept_fd ? KDBUS_HELLO_ACCEPT_FD : 0);
         hello->pool_size = KDBUS_POOL_SIZE;
diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/sd-bus/kdbus.h
index 1ea4329..79a17f3 100644
--- a/src/libsystemd/sd-bus/kdbus.h
+++ b/src/libsystemd/sd-bus/kdbus.h
@@ -500,8 +500,6 @@ enum kdbus_policy_type {
  * enum kdbus_hello_flags - flags for struct kdbus_cmd_hello
  * @KDBUS_HELLO_ACCEPT_FD:	The connection allows the reception of
  *				any passed file descriptors
- * @KDBUS_HELLO_ACCEPT_MEMFD:	The connection allows the reception of
- *				any passed memfd file descriptors
  * @KDBUS_HELLO_ACTIVATOR:	Special-purpose connection which registers
  *				a well-know name for a process to be started
  *				when traffic arrives
@@ -516,10 +514,9 @@ enum kdbus_policy_type {
  */
 enum kdbus_hello_flags {
 	KDBUS_HELLO_ACCEPT_FD		=  1ULL <<  0,
-	KDBUS_HELLO_ACCEPT_MEMFD	=  1ULL <<  1,
-	KDBUS_HELLO_ACTIVATOR		=  1ULL <<  2,
-	KDBUS_HELLO_POLICY_HOLDER	=  1ULL <<  3,
-	KDBUS_HELLO_MONITOR		=  1ULL <<  4,
+	KDBUS_HELLO_ACTIVATOR		=  1ULL <<  1,
+	KDBUS_HELLO_POLICY_HOLDER	=  1ULL <<  2,
+	KDBUS_HELLO_MONITOR		=  1ULL <<  3,
 };
 
 /**
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index e34a6bb..549f9e0 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -171,7 +171,7 @@ _public_ int sd_bus_new(sd_bus **ret) {
         r->input_fd = r->output_fd = -1;
         r->message_version = 1;
         r->creds_mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES|SD_BUS_CREDS_UNIQUE_NAME;
-        r->hello_flags |= KDBUS_HELLO_ACCEPT_FD | KDBUS_HELLO_ACCEPT_MEMFD;
+        r->hello_flags |= KDBUS_HELLO_ACCEPT_FD;
         r->attach_flags |= KDBUS_ATTACH_NAMES;
         r->original_pid = getpid();