From b737e4d7433577403a31cff6614f6a1b0b5e22f4 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 14 Dec 2016 00:36:34 +0000 Subject: upstream commit disable Unix-domain socket forwarding when privsep is disabled Upstream-ID: ab61516ae0faadad407857808517efa900a0d6d0 --- serverloop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'serverloop.c') diff --git a/serverloop.c b/serverloop.c index 955f5cc91..c4e4699da 100644 --- a/serverloop.c +++ b/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -479,7 +479,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 { @@ -760,7 +761,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 { -- cgit v1.2.3