picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

varlink: add varlink server to event loop only if there is one

Browse source
This commit is contained in:
Lennart Poettering 2019-05-28 14:19:18 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent aaae57139b
commit 7e69d90c8d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/shared/varlink.c
View file

@ -2052,12 +2052,14 @@ int varlink_server_add_connection(VarlinkServer *server, int fd, Varlink **ret)
varlink_set_state(v, VARLINK_IDLE_SERVER);
r = varlink_attach_event(v, server->event, server->event_priority);
if (r < 0) {
varlink_log_errno(v, r, "Failed to attach new connection: %m");
v->fd = -1; /* take the fd out of the connection again */
varlink_close(v);
return r;
if (server->event) {
r = varlink_attach_event(v, server->event, server->event_priority);
if (r < 0) {
varlink_log_errno(v, r, "Failed to attach new connection: %m");
v->fd = -1; /* take the fd out of the connection again */
varlink_close(v);
return r;
}
}
if (ret)