summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:16:32 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:16:32 +1100
commitdff5099f13e2e679b93d3cfe7073c9cd92b19b06 (patch)
treef80cf1916ad026e5550e61da139e52899fa04629 /ssh.c
parent76e1e368b561cabeb55c21dc205c3f6805179ad5 (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.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/ssh.c b/ssh.c
index 76d45c96..6cf9f9b7 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.155 2001/12/28 12:14:27 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.156 2001/12/28 14:50:54 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -880,7 +880,6 @@ static int
ssh_session(void)
{
int type;
- int plen;
int interactive = 0;
int have_tty = 0;
struct winsize ws;
@@ -898,7 +897,7 @@ ssh_session(void)
packet_put_int(options.compression_level);
packet_send();
packet_write_wait();
- type = packet_read(&plen);
+ type = packet_read();
if (type == SSH_SMSG_SUCCESS)
packet_start_compression(options.compression_level);
else if (type == SSH_SMSG_FAILURE)
@@ -936,7 +935,7 @@ ssh_session(void)
packet_write_wait();
/* Read response from the server. */
- type = packet_read(&plen);
+ type = packet_read();
if (type == SSH_SMSG_SUCCESS) {
interactive = 1;
have_tty = 1;
@@ -955,7 +954,7 @@ ssh_session(void)
x11_request_forwarding_with_spoofing(0, proto, data);
/* Read response from the server. */
- type = packet_read(&plen);
+ type = packet_read();
if (type == SSH_SMSG_SUCCESS) {
interactive = 1;
} else if (type == SSH_SMSG_FAILURE) {
@@ -975,7 +974,7 @@ ssh_session(void)
auth_request_forwarding();
/* Read response from the server. */
- type = packet_read(&plen);
+ type = packet_read();
packet_check_eom();
if (type != SSH_SMSG_SUCCESS)
log("Warning: Remote host denied authentication agent forwarding.");