summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libsystemd-bus/bus-kernel.c11
-rw-r--r--src/libsystemd-bus/kdbus.h3
2 files changed, 3 insertions, 11 deletions
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index ffa843d5d1..bf8de04ab6 100644
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -654,7 +654,7 @@ int bus_kernel_read_message(sd_bus *bus, sd_bus_message **m) {
int bus_kernel_create(const char *name, char **s) {
struct kdbus_cmd_bus_make *make;
- struct kdbus_item *n, *cg;
+ struct kdbus_item *n;
size_t l;
int fd;
char *p;
@@ -671,17 +671,12 @@ int bus_kernel_create(const char *name, char **s) {
KDBUS_ITEM_HEADER_SIZE + sizeof(uint64_t) +
KDBUS_ITEM_HEADER_SIZE + DECIMAL_STR_MAX(uid_t) + 1 + l + 1);
- cg = make->items;
- cg->type = KDBUS_MAKE_CGROUP;
- cg->data64[0] = 1;
- cg->size = KDBUS_ITEM_HEADER_SIZE + sizeof(uint64_t);
-
- n = KDBUS_ITEM_NEXT(cg);
+ n = make->items;
n->type = KDBUS_MAKE_NAME;
sprintf(n->str, "%lu-%s", (unsigned long) getuid(), name);
n->size = KDBUS_ITEM_HEADER_SIZE + strlen(n->str) + 1;
- make->size = offsetof(struct kdbus_cmd_bus_make, items) + cg->size + n->size;
+ make->size = offsetof(struct kdbus_cmd_bus_make, items) + n->size;
make->flags = KDBUS_MAKE_POLICY_OPEN;
make->bus_flags = 0;
make->bloom_size = BLOOM_SIZE;
diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index 4604eb32b7..06c2c245f3 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -283,9 +283,6 @@ enum {
enum {
_KDBUS_MAKE_NULL,
KDBUS_MAKE_NAME,
- KDBUS_MAKE_CGROUP, /* the cgroup hierarchy ID for which to attach
- * cgroup membership paths to messages.
- * FIXME: remove, use *the* hierarchy */
KDBUS_MAKE_CRED, /* allow translator services which connect
* to the bus on behalf of somebody else,
* allow specifiying the credentials of the