summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-06-18 04:05:03 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-06-18 04:05:03 +0000
commitdc325368e83d5ead4a841fb98e2875c0538f5116 (patch)
tree03e410e888bbcdc3c607438c0534fd13bc4a2215 /usr.bin/ssh/serverloop.c
parentf0692cef8da2efb70ad8ab2eb85694990001dee1 (diff)
split auth-rsa option parsing into auth-options
add options support to authorized_keys2
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r--usr.bin/ssh/serverloop.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 74a800b9d96..46ac69a5ca7 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -23,6 +23,7 @@
#include "ssh2.h"
#include "session.h"
#include "dispatch.h"
+#include "auth-options.h"
static Buffer stdin_buffer; /* Buffer for stdin data. */
static Buffer stdout_buffer; /* Buffer for stdout data. */
@@ -706,7 +707,13 @@ input_direct_tcpip(void)
debug("open direct-tcpip: from %s port %d to %s port %d",
originator, originator_port, target, target_port);
+
/* XXX check permission */
+ if (! no_port_forwarding_flag) {
+ xfree(target);
+ xfree(originator);
+ return -1;
+ }
sock = channel_connect_to(target, target_port);
xfree(target);
xfree(originator);