diff options
| author | Daniel Mack <daniel@zonque.org> | 2016-02-11 22:12:04 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2016-02-11 22:12:04 +0100 |
| commit | 9ca6ff50ab7af9d122521c5bb9cc8201cb38181a (patch) | |
| tree | 25cccd673eb89f5783fb31c14e27030b25c7fd0f /src/core/execute.c | |
| parent | c8b166b3ead88315b2f463fcf475e532b1300f72 (diff) | |
Remove kdbus custom endpoint support
This feature will not be used anytime soon, so remove a bit of cruft.
The BusPolicy= config directive will stay around as compat noop.
Diffstat (limited to 'src/core/execute.c')
| -rw-r--r-- | src/core/execute.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 1e4630182d..30f7e05b90 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -57,7 +57,6 @@ #endif #include "async.h" #include "barrier.h" -#include "bus-endpoint.h" #include "cap-list.h" #include "capability-util.h" #include "def.h" @@ -1387,9 +1386,6 @@ static bool exec_needs_mount_namespace( if (context->private_tmp && runtime && (runtime->tmp_dir || runtime->var_tmp_dir)) return true; - if (params->bus_endpoint_path) - return true; - if (context->private_devices || context->protect_system != PROTECT_SYSTEM_NO || context->protect_home != PROTECT_HOME_NO) @@ -1423,9 +1419,6 @@ static int close_remaining_fds( n_dont_close += n_fds; } - if (params->bus_endpoint_fd >= 0) - dont_close[n_dont_close++] = params->bus_endpoint_fd; - if (runtime) { if (runtime->netns_storage_socket[0] >= 0) dont_close[n_dont_close++] = runtime->netns_storage_socket[0]; @@ -1655,16 +1648,6 @@ static int exec_child( } } - if (params->bus_endpoint_fd >= 0 && context->bus_endpoint) { - uid_t ep_uid = (uid == UID_INVALID) ? 0 : uid; - - r = bus_kernel_set_endpoint_policy(params->bus_endpoint_fd, ep_uid, context->bus_endpoint); - if (r < 0) { - *exit_status = EXIT_BUS_ENDPOINT; - return r; - } - } - /* If delegation is enabled we'll pass ownership of the cgroup * (but only in systemd's own controller hierarchy!) to the * user of the new process. */ @@ -1787,7 +1770,6 @@ static int exec_child( context->inaccessible_dirs, tmp, var, - params->bus_endpoint_path, context->private_devices, context->protect_home, context->protect_system, @@ -2214,9 +2196,6 @@ void exec_context_done(ExecContext *c) { c->address_families = set_free(c->address_families); c->runtime_directory = strv_free(c->runtime_directory); - - bus_endpoint_free(c->bus_endpoint); - c->bus_endpoint = NULL; } int exec_context_destroy_runtime_directory(ExecContext *c, const char *runtime_prefix) { |