diff options
| author | nicm <nicm> | 2015-10-18 20:42:42 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-10-18 20:42:42 +0000 |
| commit | 174a2ad731055f97838290226d656813143620ca (patch) | |
| tree | cc063339064f0dda959e4d7f81416d1691c5de37 /server-client.c | |
| parent | 9c601ebde81a3965541161499ebce0b5e5f1122f (diff) | |
Pass current directory as a string rather than a file descriptor because
pledge doesn't let us pass directory file descriptors.
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c index 10768839..52ced4d4 100644 --- a/server-client.c +++ b/server-client.c @@ -1166,9 +1166,10 @@ server_client_msg_identify(struct client *c, struct imsg *imsg) c->ttyname = xstrdup(data); break; case MSG_IDENTIFY_CWD: - if (datalen != 0) - fatalx("bad MSG_IDENTIFY_CWD size"); - c->cwd = imsg->fd; + if (datalen == 0 || data[datalen - 1] != '\0') + fatalx("bad MSG_IDENTIFY_CWD string"); + if ((c->cwd = open(data, O_RDONLY)) == -1) + c->cwd = open("/", O_RDONLY); break; case MSG_IDENTIFY_STDIN: if (datalen != 0) |