diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-09 11:02:59 +1000 |
commit | 30c3d429306bb4afe71c18db92816b981f7b6d9d (patch) | |
tree | a65f45e0073cb55ad42957a36b4636ff21405108 /clientloop.c | |
parent | 61e50f10c276009bf9472fdd797bf6be60fc2a83 (diff) |
- OpenBSD CVS update
- markus@cvs.openbsd.org
[cipher.h myproposal.h readconf.c readconf.h servconf.c ssh.1 ssh.c]
[ssh.h sshconnect1.c sshconnect2.c sshd.8]
- complain about invalid ciphers in SSH1 (e.g. arcfour is SSH2 only)
- hugh@cvs.openbsd.org
[ssh.1]
- zap typo
[ssh-keygen.1]
- One last nit fix. (markus approved)
[sshd.8]
- some markus certified spelling adjustments
- markus@cvs.openbsd.org
[auth2.c channels.c clientloop.c compat compat.h dsa.c kex.c]
[sshconnect2.c ]
- bug compat w/ ssh-2.0.13 x11, split out bugs
[nchan.c]
- no drain if ibuf_empty, fixes x11fwd problems; tests by fries@
[ssh-keygen.c]
- handle escapes in real and original key format, ok millert@
[version.h]
- OpenSSH-2.1
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index e34f5cdaa..82d1d27d6 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -16,7 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | RCSID("$Id: clientloop.c,v 1.15 2000/05/08 03:44:53 damien Exp $"); | 19 | RCSID("$Id: clientloop.c,v 1.16 2000/05/09 01:03:00 damien Exp $"); |
20 | 20 | ||
21 | #include "xmalloc.h" | 21 | #include "xmalloc.h" |
22 | #include "ssh.h" | 22 | #include "ssh.h" |
@@ -979,11 +979,11 @@ client_input_channel_open(int type, int plen) | |||
979 | char *originator; | 979 | char *originator; |
980 | int originator_port; | 980 | int originator_port; |
981 | originator = packet_get_string(NULL); | 981 | originator = packet_get_string(NULL); |
982 | if (packet_remaining() > 0) { | 982 | if (datafellows & SSH_BUG_X11FWD) { |
983 | originator_port = packet_get_int(); | ||
984 | } else { | ||
985 | debug("buggy server: x11 request w/o originator_port"); | 983 | debug("buggy server: x11 request w/o originator_port"); |
986 | originator_port = 0; | 984 | originator_port = 0; |
985 | } else { | ||
986 | originator_port = packet_get_int(); | ||
987 | } | 987 | } |
988 | packet_done(); | 988 | packet_done(); |
989 | /* XXX check permission */ | 989 | /* XXX check permission */ |