summaryrefslogtreecommitdiff
path: root/src/socket.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-16 16:25:42 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-16 16:27:24 +0200
commitdf1f0afe0c0d044a42ee726fa03730291d7082ee (patch)
treeec9aba0611608c2666aabac5ebc1b41b1c2508bd /src/socket.c
parent0213c3f8102bdc934c629d11a44ca0b408762287 (diff)
tcpwrap: execute tcpwrap check in forked client, to avoid blocking name lookups in main systemd process
Diffstat (limited to 'src/socket.c')
-rw-r--r--src/socket.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/socket.c b/src/socket.c
index 71f1672027..1852fe9375 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -36,7 +36,6 @@
#include "strv.h"
#include "unit-name.h"
#include "dbus-socket.h"
-#include "tcpwrap.h"
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
@@ -108,9 +107,6 @@ static void socket_done(Unit *u) {
free(s->bind_to_device);
s->bind_to_device = NULL;
- free(s->tcpwrap_name);
- s->tcpwrap_name = NULL;
-
unit_unwatch_timer(u, &s->timer_watch);
}
@@ -309,11 +305,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
"%sBindToDevice: %s\n",
prefix, s->bind_to_device);
- if (s->tcpwrap_name)
- fprintf(f,
- "%sTCPWrapName: %s\n",
- prefix, s->tcpwrap_name);
-
if (s->accept)
fprintf(f,
"%sAccepted: %u\n",
@@ -1221,12 +1212,6 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
break;
}
-
- if (s->tcpwrap_name)
- if (!socket_tcpwrap(cfd, s->tcpwrap_name)) {
- close_nointr_nofail(cfd);
- return;
- }
}
socket_enter_running(s, cfd);