X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsocket.c;h=7ddf326a2252c40481b5b86124dd45f25945d13a;hb=4d8a7798e7f12c6400495cbc4d0ad57ed20ce90a;hp=468d1018c1f1d61e2c32c223647f35b8044fcdd4;hpb=f975e971accc4d50c73ae53167db3df7a7099cf2;p=elogind.git diff --git a/src/socket.c b/src/socket.c index 468d1018c..7ddf326a2 100644 --- a/src/socket.c +++ b/src/socket.c @@ -844,7 +844,7 @@ static int mq_address_create( fd = mq_open(path, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_CREAT, mq_mode, attr); umask(old_mask); - if (fd < 0 && errno != EEXIST) { + if (fd < 0) { r = -errno; goto fail; } @@ -1112,6 +1112,7 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) { true, s->meta.manager->confirm_spawn, s->meta.cgroup_bondings, + s->meta.cgroup_attributes, &pid); strv_free(argv); @@ -1961,6 +1962,12 @@ int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds) { if (p->fd >= 0) rn_fds++; + if (rn_fds <= 0) { + *fds = NULL; + *n_fds = 0; + return 0; + } + if (!(rfds = new(int, rn_fds))) return -ENOMEM;