chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f74df7b
)
socket: properly handle if our service vanished during runtime
author
Lennart Poettering
<lennart@poettering.net>
Thu, 22 May 2014 07:56:21 +0000
(16:56 +0900)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 22 May 2014 07:56:21 +0000
(16:56 +0900)
src/core/socket.c
patch
|
blob
|
history
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 05af8fe9d25e4bee0f4928843bdcf35fe291a0ee..aca20fd10671b10ab6433675a72cd894f218d552 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-1503,6
+1503,12
@@
static void socket_enter_running(Socket *s, int cfd) {
}
if (!pending) {
+ if (!UNIT_ISSET(s->service)) {
+ log_error_unit(UNIT(s)->id, "%s: service to activate vanished, refusing activation.", UNIT(s)->id);
+ r = -ENOENT;
+ goto fail;
+ }
+
r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT_DEREF(s->service), JOB_REPLACE, true, &error, NULL);
if (r < 0)
goto fail;