bus: sync up with kdbus

This commit is contained in:
Daniel Mack
2013-12-17 12:25:20 +01:00
parent f92f3ff967
commit 613ec4b836
2 changed files with 1 additions and 3 deletions
+1 -1
View File
@@ -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;
-2
View File
@@ -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,