SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "sd-bus: sync kdbus.h (ABI break)"

Browse Source 
This reverts commit 1a2409e262.

Support from the kdbus interface was removed. We require
memfds to be supported by all clients.
This commit is contained in:
Kay Sievers
2014-10-17 10:12:44 +02:00
parent f60e98b336
commit c32195e057
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-kernel.c
-1
View File
@@ -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;
src/libsystemd/sd-bus/kdbus.h
+3 -6
View File
@@ -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,
};
/**
src/libsystemd/sd-bus/sd-bus.c
+1 -1
View File
@@ -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();