summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-03-14 03:01:27 +0100
committerLennart Poettering <lennart@poettering.net>2012-03-14 03:01:27 +0100
commit9586cdfab6a2638078702b7fea7e16b3a71899e2 (patch)
tree2c3a126746b7a54b6e0feb483ab028d740084b9c
parent6b80b9b8ee6d372e00ece51e6a11c6d31899aaec (diff)
socket: if we fail to create an instantiated service for a socket, don't put the socket in failure mode
An incoming connection that is immediately terminated might result in getpeername() or a similar call failing. Hence it is quite possible that while we are setting up an instantiated service for a socket we might get an error and we shouldn't take this as hint to take the listening socket down. https://bugs.freedesktop.org/show_bug.cgi?id=45297 https://bugzilla.novell.com/show_bug.cgi?id=741590
-rw-r--r--TODO6
-rw-r--r--src/socket.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/TODO b/TODO
index 249c0e4108..7bcb94f1fe 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,12 @@ Bugfixes:
Features:
+* add DeleteSocketsOnStop=yes|no option to socket units
+
+* add shutdown inhibit API for usage by libvirt and friends
+
+* journal: store euid in journal if it differs from uid
+
* support chrony in addition to ntpd in timedated
* journal: extend sd-journal.h logging calls to implicitly log function names/line numbers/...
diff --git a/src/socket.c b/src/socket.c
index ecaf3d2148..8704eff41d 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1491,7 +1491,6 @@ static void socket_enter_running(Socket *s, int cfd) {
fail:
log_warning("%s failed to queue socket startup job: %s", UNIT(s)->id, bus_error(&error, r));
- socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
if (cfd >= 0)
close_nointr_nofail(cfd);