[channels.c]
     deny dynamic forwarding with -R for v1, too; ok djm@
This commit is contained in:
Darren Tucker 2003-07-03 13:52:04 +10:00
parent edeb1f7449
commit 9189ff89c3
2 changed files with 11 additions and 4 deletions

View File

@ -12,6 +12,9 @@
- markus@cvs.openbsd.org 2003/06/29 12:44:38 - markus@cvs.openbsd.org 2003/06/29 12:44:38
[sshconnect.c] [sshconnect.c]
memset 0, not \0; andrushock@korovino.net memset 0, not \0; andrushock@korovino.net
- markus@cvs.openbsd.org 2003/07/02 12:56:34
[channels.c]
deny dynamic forwarding with -R for v1, too; ok djm@
20030630 20030630
- (djm) Search for support functions necessary to build our - (djm) Search for support functions necessary to build our
@ -632,4 +635,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2838 2003/07/03 03:48:04 dtucker Exp $ $Id: ChangeLog,v 1.2839 2003/07/03 03:52:04 dtucker Exp $

View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.191 2003/06/24 08:23:46 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.192 2003/07/02 12:56:34 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -2201,9 +2201,13 @@ channel_input_port_forward_request(int is_root, int gateway_ports)
* privileged port. * privileged port.
*/ */
if (port < IPPORT_RESERVED && !is_root) if (port < IPPORT_RESERVED && !is_root)
packet_disconnect("Requested forwarding of port %d but user is not root.", packet_disconnect(
port); "Requested forwarding of port %d but user is not root.",
port);
if (host_port == 0)
packet_disconnect("Dynamic forwarding denied.");
#endif #endif
/* Initiate forwarding */ /* Initiate forwarding */
channel_setup_local_fwd_listener(port, hostname, host_port, gateway_ports); channel_setup_local_fwd_listener(port, hostname, host_port, gateway_ports);