free(b->machine);
free(b->fake_label);
free(b->cgroup_root);
- free(b->connection_name);
+ free(b->description);
free(b->exec_path);
strv_free(b->exec_argv);
return 0;
}
-_public_ int sd_bus_set_name(sd_bus *bus, const char *name) {
- char *n;
-
+_public_ int sd_bus_set_description(sd_bus *bus, const char *description) {
assert_return(bus, -EINVAL);
- assert_return(name, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
- n = strdup(name);
- if (!n)
- return -ENOMEM;
-
- free(bus->connection_name);
- bus->connection_name = n;
-
- return 0;
+ return free_and_strdup(&bus->description, description);
}
static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
machine = NULL;
free(b->kernel);
- b->kernel = strdup("/dev/kdbus/0-system/bus");
+ b->kernel = strdup("/sys/fs/kdbus/0-system/bus");
if (!b->kernel)
return -ENOMEM;
/* We don't know whether the bus is trusted or not, so better
* be safe, and authenticate everything */
b->trusted = false;
- b->attach_flags |= KDBUS_ATTACH_CAPS | KDBUS_ATTACH_CREDS;
+ b->attach_flags |= KDBUS_ATTACH_CAPS | KDBUS_ATTACH_CREDS | KDBUS_ATTACH_PIDS;
r = sd_bus_start(b);
if (r < 0)
return -ENOMEM;
#ifdef ENABLE_KDBUS
- asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, getuid(), ee);
+ (void) asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, getuid(), ee);
#else
- asprintf(&b->address, UNIX_USER_BUS_FMT, ee);
+ (void) asprintf(&b->address, UNIX_USER_BUS_FMT, ee);
#endif
} else {
#ifdef ENABLE_KDBUS
- int r;
-
- r = asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid());
- if (r < 0)
- return -ENOMEM;
+ (void) asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid());
#else
return -ECONNREFUSED;
#endif
return bus_type_is_valid(type);
}
-_public_ int sd_bus_get_server_id(sd_bus *bus, sd_id128_t *server_id) {
+_public_ int sd_bus_get_owner_id(sd_bus *bus, sd_id128_t *id) {
int r;
assert_return(bus, -EINVAL);
- assert_return(server_id, -EINVAL);
+ assert_return(id, -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
r = bus_ensure_running(bus);
if (r < 0)
return r;
- *server_id = bus->server_id;
+ *id = bus->server_id;
return 0;
}
if (r < 0)
return r;
- r = sd_event_source_set_name(bus->input_io_event_source, "bus-input");
+ r = sd_event_source_set_description(bus->input_io_event_source, "bus-input");
} else
r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd);
if (r < 0)
return r;
- r = sd_event_source_set_name(bus->input_io_event_source, "bus-output");
+ r = sd_event_source_set_description(bus->input_io_event_source, "bus-output");
} else
r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd);
if (r < 0)
goto fail;
- r = sd_event_source_set_name(bus->time_event_source, "bus-time");
+ r = sd_event_source_set_description(bus->time_event_source, "bus-time");
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = sd_event_source_set_name(bus->quit_event_source, "bus-exit");
+ r = sd_event_source_set_description(bus->quit_event_source, "bus-exit");
if (r < 0)
goto fail;
return 0;
}
-_public_ int sd_bus_get_name(sd_bus *bus, const char **name) {
+_public_ int sd_bus_get_description(sd_bus *bus, const char **description) {
assert_return(bus, -EINVAL);
- assert_return(name, -EINVAL);
+ assert_return(description, -EINVAL);
+ assert_return(bus->description, -ENXIO);
assert_return(!bus_pid_changed(bus), -ECHILD);
- *name = bus->connection_name;
+ *description = bus->description;
return 0;
}