dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
kdbus learned KDBUS_HELLO_ACCEPT_MEMFD as new connection negotiation
flag. Set it by default in systemd for now.
This commit is contained in:
Daniel Mack
2014-10-14 20:03:06 +02:00
parent b0f84d4d78
commit 1a2409e262
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libsystemd/sd-bus/bus-kernel.c
View File

@@ -1566,6 +1566,7 @@ 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;

9
src/libsystemd/sd-bus/kdbus.h
View File

@@ -500,6 +500,8 @@ 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
@@ -514,9 +516,10 @@ enum kdbus_policy_type {
*/
enum kdbus_hello_flags {
KDBUS_HELLO_ACCEPT_FD = 1ULL << 0,
KDBUS_HELLO_ACTIVATOR = 1ULL << 1,
KDBUS_HELLO_POLICY_HOLDER = 1ULL << 2,
KDBUS_HELLO_MONITOR = 1ULL << 3,
KDBUS_HELLO_ACCEPT_MEMFD = 1ULL << 1,
KDBUS_HELLO_ACTIVATOR = 1ULL << 2,
KDBUS_HELLO_POLICY_HOLDER = 1ULL << 3,
KDBUS_HELLO_MONITOR = 1ULL << 4,
};
/**

2
src/libsystemd/sd-bus/sd-bus.c
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;
r->hello_flags |= KDBUS_HELLO_ACCEPT_FD | KDBUS_HELLO_ACCEPT_MEMFD;
r->attach_flags |= KDBUS_ATTACH_NAMES;
r->original_pid = getpid();