summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2000-10-14 12:12:09 +0000
committermarkus <markus@openbsd.org>2000-10-14 12:12:09 +0000
commitf0a650034e77417a0379a5adc5215f6713995606 (patch)
tree453ffc700f2109284fcfcd6b9b887339a6934fd4 /usr.bin/ssh/serverloop.c
parentCipher is for SSH-1 only (diff)
downloadwireguard-openbsd-f0a650034e77417a0379a5adc5215f6713995606.tar.xz
wireguard-openbsd-f0a650034e77417a0379a5adc5215f6713995606.zip
AllowTcpForwarding; from naddy@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r--usr.bin/ssh/serverloop.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 97e01754256..7ba4832191d 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -49,6 +49,8 @@
#include "dispatch.h"
#include "auth-options.h"
+extern ServerOptions options;
+
static Buffer stdin_buffer; /* Buffer for stdin data. */
static Buffer stdout_buffer; /* Buffer for stdout data. */
static Buffer stderr_buffer; /* Buffer for stderr data. */
@@ -733,7 +735,7 @@ input_direct_tcpip(void)
originator, originator_port, target, target_port);
/* XXX check permission */
- if (no_port_forwarding_flag) {
+ if (no_port_forwarding_flag || !options.allow_tcp_forwarding) {
xfree(target);
xfree(originator);
return -1;