diff options
| author | Daniel Mack <zonque@gmail.com> | 2013-12-17 12:25:20 +0100 |
|---|---|---|
| committer | Daniel Mack <zonque@gmail.com> | 2013-12-17 12:25:20 +0100 |
| commit | 613ec4b836c6f322762b4a3e358d22a81b8d6f2c (patch) | |
| tree | 94d8822dc671b2349a99fb8eac6cf3a3bead2449 | |
| parent | f92f3ff96777048c1f21d5cc4548401b3c5047bc (diff) | |
bus: sync up with kdbus
| -rw-r--r-- | src/libsystemd-bus/bus-kernel.c | 2 | ||||
| -rw-r--r-- | src/libsystemd-bus/kdbus.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c index 0e47308238..f32f271b7d 100644 --- a/src/libsystemd-bus/bus-kernel.c +++ b/src/libsystemd-bus/bus-kernel.c @@ -1141,7 +1141,7 @@ int bus_kernel_create_starter(const char *bus, const char *name) { n = hello->items; strcpy(n->str, name); n->size = offsetof(struct kdbus_item, str) + strlen(n->str) + 1; - n->type = KDBUS_ITEM_ACTIVATOR_NAME; + n->type = KDBUS_ITEM_NAME; hello->size = ALIGN8(offsetof(struct kdbus_cmd_hello, items) + n->size); hello->conn_flags = KDBUS_HELLO_ACTIVATOR; diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h index fd9ca2d5fc..972a02df8d 100644 --- a/src/libsystemd-bus/kdbus.h +++ b/src/libsystemd-bus/kdbus.h @@ -207,7 +207,6 @@ struct kdbus_policy { * @KDBUS_ITEM_POLICY_NAME: Policy in struct kdbus_policy * @KDBUS_ITEM_POLICY_ACCESS: Policy in struct kdbus_policy * @KDBUS_ITEM_NAME: Well-know name with flags - * @KDBUS_ITEM_ACTIVATOR_NAME: Well-known name for the activator * @KDBUS_ITEM_TIMESTAMP: Timestamp * @KDBUS_ITEM_CREDS: Process credential * @KDBUS_ITEM_PID_COMM: Process ID "comm" identifier @@ -244,7 +243,6 @@ enum kdbus_item_type { _KDBUS_ITEM_ATTACH_BASE = 0x600, KDBUS_ITEM_NAME = _KDBUS_ITEM_ATTACH_BASE, - KDBUS_ITEM_ACTIVATOR_NAME, KDBUS_ITEM_TIMESTAMP, KDBUS_ITEM_CREDS, KDBUS_ITEM_PID_COMM, |