diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-10-17 10:09:14 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-10-17 10:12:44 +0200 |
| commit | c32195e057e5bf903c2645e273ba82f32c0106d3 (patch) | |
| tree | 76629720fe7f46e6cea892b6096036aa828d9bea | |
| parent | f60e98b33646e7a3317553e13bac591a98ce41c0 (diff) | |
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.
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/kdbus.h | 9 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 27899c1989..c3dbc837d7 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 1ea4329ea2..79a17f3449 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 e34a6bbd87..549f9e0943 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(); |