diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-19 19:16:08 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-19 19:16:08 +0200 |
| commit | 3bb07b7680c543c982077ac075abe8badeb46ca1 (patch) | |
| tree | 958ea1a7da76d0cb817c30f2b6d1abad41e0691f /src/core/socket.c | |
| parent | 8530dc4467691a893aa2e07319b18a84fec96cad (diff) | |
Revert "socket: introduce SELinuxLabelViaNet option"
This reverts commit cf8bd44339b00330fdbc91041d6731ba8aba9fec.
Needs more discussion on the mailing list.
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 34ce1b1ffd..a16b20d739 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -31,10 +31,6 @@ #include <mqueue.h> #include <sys/xattr.h> -#ifdef HAVE_SELINUX -#include <selinux/selinux.h> -#endif - #include "sd-event.h" #include "log.h" #include "load-dropin.h" @@ -492,8 +488,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { "%sPassCredentials: %s\n" "%sPassSecurity: %s\n" "%sTCPCongestion: %s\n" - "%sRemoveOnStop: %s\n" - "%sSELinuxLabelViaNet: %s\n", + "%sRemoveOnStop: %s\n", prefix, socket_state_to_string(s->state), prefix, socket_result_to_string(s->result), prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only), @@ -508,8 +503,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { prefix, yes_no(s->pass_cred), prefix, yes_no(s->pass_sec), prefix, strna(s->tcp_congestion), - prefix, yes_no(s->remove_on_stop), - prefix, yes_no(s->selinux_label_via_net)); + prefix, yes_no(s->remove_on_stop)); if (s->control_pid > 0) fprintf(f, @@ -1136,14 +1130,7 @@ static int socket_open_fds(Socket *s) { continue; if (p->type == SOCKET_SOCKET) { -#ifdef HAVE_SELINUX - if (!know_label && s->selinux_label_via_net) { - r = getcon(&label); - if (r < 0) - return r; - know_label = true; - } -#endif + if (!know_label) { r = socket_instantiate_service(s); @@ -1842,9 +1829,6 @@ static void socket_enter_running(Socket *s, int cfd) { cfd = -1; s->n_connections ++; - if (s->selinux_label_via_net) - service->exec_context.selinux_label_via_net = true; - r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT(service), JOB_REPLACE, true, &error, NULL); if (r < 0) goto fail; |