diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2016-12-14 00:36:35 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2016-12-14 00:36:35 +0000 |
| commit | 8c8331bfb4f5c80447ca40e91defde79e5bf336b (patch) | |
| tree | f6960b3b6bde3801740eed9dd115126cd6777c58 /usr.bin | |
| parent | 5275ef2b906b9ace0f77873da176f8af4606f623 (diff) | |
disable Unix-domain socket forwarding when privsep is disabled
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 679ad13c044..3c413e5bb10 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.188 2016/11/30 03:00:05 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.189 2016/12/14 00:36:34 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -472,7 +472,8 @@ server_request_direct_streamlocal(void) /* XXX fine grained permissions */ if ((options.allow_streamlocal_forwarding & FORWARD_LOCAL) != 0 && - !no_port_forwarding_flag && !options.disable_forwarding) { + !no_port_forwarding_flag && !options.disable_forwarding && + use_privsep) { c = channel_connect_to_path(target, "direct-streamlocal@openssh.com", "direct-streamlocal"); } else { @@ -748,7 +749,8 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) /* check permissions */ if ((options.allow_streamlocal_forwarding & FORWARD_REMOTE) == 0 - || no_port_forwarding_flag || options.disable_forwarding) { + || no_port_forwarding_flag || options.disable_forwarding || + !use_privsep) { success = 0; packet_send_debug("Server has disabled port forwarding."); } else { |