summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/mux.c b/mux.c
index d8e416262..a38746796 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.55 2015/10/15 23:51:40 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.56 2015/12/03 17:00:18 semarie Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1851,6 +1851,9 @@ mux_client_request_session(int fd)
1851 mm_send_fd(fd, STDERR_FILENO) == -1) 1851 mm_send_fd(fd, STDERR_FILENO) == -1)
1852 fatal("%s: send fds failed", __func__); 1852 fatal("%s: send fds failed", __func__);
1853 1853
1854 if (pledge("stdio proc tty", NULL) == -1)
1855 fatal("%s pledge(): %s", __func__, strerror(errno));
1856
1854 debug3("%s: session request sent", __func__); 1857 debug3("%s: session request sent", __func__);
1855 1858
1856 /* Read their reply */ 1859 /* Read their reply */
@@ -1996,6 +1999,9 @@ mux_client_request_stdio_fwd(int fd)
1996 mm_send_fd(fd, STDOUT_FILENO) == -1) 1999 mm_send_fd(fd, STDOUT_FILENO) == -1)
1997 fatal("%s: send fds failed", __func__); 2000 fatal("%s: send fds failed", __func__);
1998 2001
2002 if (pledge("stdio proc tty", NULL) == -1)
2003 fatal("%s pledge(): %s", __func__, strerror(errno));
2004
1999 debug3("%s: stdio forward request sent", __func__); 2005 debug3("%s: stdio forward request sent", __func__);
2000 2006
2001 /* Read their reply */ 2007 /* Read their reply */
@@ -2159,6 +2165,9 @@ muxclient(const char *path)
2159 } 2165 }
2160 set_nonblock(sock); 2166 set_nonblock(sock);
2161 2167
2168 if (pledge("stdio sendfd proc tty", NULL) == -1)
2169 fatal("%s pledge(): %s", __func__, strerror(errno));
2170
2162 if (mux_client_hello_exchange(sock) != 0) { 2171 if (mux_client_hello_exchange(sock) != 0) {
2163 error("%s: master hello exchange failed", __func__); 2172 error("%s: master hello exchange failed", __func__);
2164 close(sock); 2173 close(sock);