diff options
author | Thomas Adam <thomas@xteddy.org> | 2024-01-16 14:01:09 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2024-01-16 14:01:09 +0000 |
commit | 001e26d0bbca8aa53e091ee4a445c2953864fa04 (patch) | |
tree | bb2cade909ef73d151f84e6e9f731329d1f880e9 | |
parent | e809c2ec359b0fd6151cf33929244b7a7d637119 (diff) | |
parent | 2e39d698d2e6597f0c2c92bbbfd7213dca029b20 (diff) |
Merge branch 'obsd-master'
-rw-r--r-- | proc.c | 5 | ||||
-rw-r--r-- | server-client.c | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -93,8 +93,9 @@ proc_event_cb(__unused int fd, short events, void *arg) log_debug("peer %p message %d", peer, imsg.hdr.type); if (peer_check_version(peer, &imsg) != 0) { - if (imsg.fd != -1) - close(imsg.fd); + int fd = imsg_get_fd(&imsg); + if (fd != -1) + close(fd); imsg_free(&imsg); break; } diff --git a/server-client.c b/server-client.c index 79381b74..a7494503 100644 --- a/server-client.c +++ b/server-client.c @@ -2998,14 +2998,14 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg) case MSG_IDENTIFY_STDIN: if (datalen != 0) fatalx("bad MSG_IDENTIFY_STDIN size"); - c->fd = imsg->fd; - log_debug("client %p IDENTIFY_STDIN %d", c, imsg->fd); + c->fd = imsg_get_fd(imsg); + log_debug("client %p IDENTIFY_STDIN %d", c, c->fd); break; case MSG_IDENTIFY_STDOUT: if (datalen != 0) fatalx("bad MSG_IDENTIFY_STDOUT size"); - c->out_fd = imsg->fd; - log_debug("client %p IDENTIFY_STDOUT %d", c, imsg->fd); + c->out_fd = imsg_get_fd(imsg); + log_debug("client %p IDENTIFY_STDOUT %d", c, c->out_fd); break; case MSG_IDENTIFY_ENVIRON: if (datalen == 0 || data[datalen - 1] != '\0') |