diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:16:32 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:16:32 +1100 |
commit | dff5099f13e2e679b93d3cfe7073c9cd92b19b06 (patch) | |
tree | f80cf1916ad026e5550e61da139e52899fa04629 /ssh.c | |
parent | 76e1e368b561cabeb55c21dc205c3f6805179ad5 (diff) |
- markus@cvs.openbsd.org 2001/12/28 14:50:54
[auth1.c auth-rsa.c channels.c dispatch.c kex.c kexdh.c kexgex.c packet.c packet.h serverloop.c session.c ssh.c sshconnect1.c sshconnect2.c sshd.c]
packet_read* no longer return the packet length, since it's not used.
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.155 2001/12/28 12:14:27 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.156 2001/12/28 14:50:54 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -880,7 +880,6 @@ static int | |||
880 | ssh_session(void) | 880 | ssh_session(void) |
881 | { | 881 | { |
882 | int type; | 882 | int type; |
883 | int plen; | ||
884 | int interactive = 0; | 883 | int interactive = 0; |
885 | int have_tty = 0; | 884 | int have_tty = 0; |
886 | struct winsize ws; | 885 | struct winsize ws; |
@@ -898,7 +897,7 @@ ssh_session(void) | |||
898 | packet_put_int(options.compression_level); | 897 | packet_put_int(options.compression_level); |
899 | packet_send(); | 898 | packet_send(); |
900 | packet_write_wait(); | 899 | packet_write_wait(); |
901 | type = packet_read(&plen); | 900 | type = packet_read(); |
902 | if (type == SSH_SMSG_SUCCESS) | 901 | if (type == SSH_SMSG_SUCCESS) |
903 | packet_start_compression(options.compression_level); | 902 | packet_start_compression(options.compression_level); |
904 | else if (type == SSH_SMSG_FAILURE) | 903 | else if (type == SSH_SMSG_FAILURE) |
@@ -936,7 +935,7 @@ ssh_session(void) | |||
936 | packet_write_wait(); | 935 | packet_write_wait(); |
937 | 936 | ||
938 | /* Read response from the server. */ | 937 | /* Read response from the server. */ |
939 | type = packet_read(&plen); | 938 | type = packet_read(); |
940 | if (type == SSH_SMSG_SUCCESS) { | 939 | if (type == SSH_SMSG_SUCCESS) { |
941 | interactive = 1; | 940 | interactive = 1; |
942 | have_tty = 1; | 941 | have_tty = 1; |
@@ -955,7 +954,7 @@ ssh_session(void) | |||
955 | x11_request_forwarding_with_spoofing(0, proto, data); | 954 | x11_request_forwarding_with_spoofing(0, proto, data); |
956 | 955 | ||
957 | /* Read response from the server. */ | 956 | /* Read response from the server. */ |
958 | type = packet_read(&plen); | 957 | type = packet_read(); |
959 | if (type == SSH_SMSG_SUCCESS) { | 958 | if (type == SSH_SMSG_SUCCESS) { |
960 | interactive = 1; | 959 | interactive = 1; |
961 | } else if (type == SSH_SMSG_FAILURE) { | 960 | } else if (type == SSH_SMSG_FAILURE) { |
@@ -975,7 +974,7 @@ ssh_session(void) | |||
975 | auth_request_forwarding(); | 974 | auth_request_forwarding(); |
976 | 975 | ||
977 | /* Read response from the server. */ | 976 | /* Read response from the server. */ |
978 | type = packet_read(&plen); | 977 | type = packet_read(); |
979 | packet_check_eom(); | 978 | packet_check_eom(); |
980 | if (type != SSH_SMSG_SUCCESS) | 979 | if (type != SSH_SMSG_SUCCESS) |
981 | log("Warning: Remote host denied authentication agent forwarding."); | 980 | log("Warning: Remote host denied authentication agent forwarding."); |