diff options
author | Damien Miller <djm@mindrot.org> | 2000-06-18 14:50:44 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-06-18 14:50:44 +1000 |
commit | f6d9e2218998559cb67aad55d3f4a0bf53600c41 (patch) | |
tree | 87ea430020c66c697e065c164951b3f74b730b76 /serverloop.c | |
parent | 7b22d65034ac280e0b4eaa857c71b17ee3ad7d99 (diff) |
- OpenBSD CVS updates:
- deraadt@cvs.openbsd.org 2000/06/17 09:58:46
[channels.c]
everyone says "nix it" (remove protocol 2 debugging message)
- markus@cvs.openbsd.org 2000/06/17 13:24:34
[sshconnect.c]
allow extended server banners
- markus@cvs.openbsd.org 2000/06/17 14:30:10
[sshconnect.c]
missing atomicio, typo
- jakob@cvs.openbsd.org 2000/06/17 16:52:34
[servconf.c servconf.h session.c sshd.8 sshd_config]
add support for ssh v2 subsystems. ok markus@.
- deraadt@cvs.openbsd.org 2000/06/17 18:57:48
[readconf.c servconf.c]
include = in WHITESPACE; markus ok
- markus@cvs.openbsd.org 2000/06/17 19:09:10
[auth2.c]
implement bug compatibility with ssh-2.0.13 pubkey, server side
- markus@cvs.openbsd.org 2000/06/17 21:00:28
[compat.c]
initial support for ssh.com's 2.2.0
- markus@cvs.openbsd.org 2000/06/17 21:16:09
[scp.c]
typo
- markus@cvs.openbsd.org 2000/06/17 22:05:02
[auth-rsa.c auth2.c serverloop.c session.c auth-options.c auth-options.h]
split auth-rsa option parsing into auth-options
add options support to authorized_keys2
- markus@cvs.openbsd.org 2000/06/17 22:42:54
[session.c]
typo
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/serverloop.c b/serverloop.c index b08fcfd92..311a285c3 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "ssh2.h" | 23 | #include "ssh2.h" |
24 | #include "session.h" | 24 | #include "session.h" |
25 | #include "dispatch.h" | 25 | #include "dispatch.h" |
26 | #include "auth-options.h" | ||
26 | 27 | ||
27 | static Buffer stdin_buffer; /* Buffer for stdin data. */ | 28 | static Buffer stdin_buffer; /* Buffer for stdin data. */ |
28 | static Buffer stdout_buffer; /* Buffer for stdout data. */ | 29 | static Buffer stdout_buffer; /* Buffer for stdout data. */ |
@@ -719,7 +720,13 @@ input_direct_tcpip(void) | |||
719 | 720 | ||
720 | debug("open direct-tcpip: from %s port %d to %s port %d", | 721 | debug("open direct-tcpip: from %s port %d to %s port %d", |
721 | originator, originator_port, target, target_port); | 722 | originator, originator_port, target, target_port); |
723 | |||
722 | /* XXX check permission */ | 724 | /* XXX check permission */ |
725 | if (! no_port_forwarding_flag) { | ||
726 | xfree(target); | ||
727 | xfree(originator); | ||
728 | return -1; | ||
729 | } | ||
723 | sock = channel_connect_to(target, target_port); | 730 | sock = channel_connect_to(target, target_port); |
724 | xfree(target); | 731 | xfree(target); |
725 | xfree(originator); | 732 | xfree(originator); |