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 /auth1.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 'auth1.c')
-rw-r--r-- | auth1.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.33 2001/12/28 13:57:33 markus Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.34 2001/12/28 14:50:54 markus Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "rsa.h" | 16 | #include "rsa.h" |
@@ -71,7 +71,6 @@ do_authloop(Authctxt *authctxt) | |||
71 | char *client_user, *password; | 71 | char *client_user, *password; |
72 | char info[1024]; | 72 | char info[1024]; |
73 | u_int dlen; | 73 | u_int dlen; |
74 | int plen; | ||
75 | u_int ulen; | 74 | u_int ulen; |
76 | int type = 0; | 75 | int type = 0; |
77 | struct passwd *pw = authctxt->pw; | 76 | struct passwd *pw = authctxt->pw; |
@@ -109,7 +108,7 @@ do_authloop(Authctxt *authctxt) | |||
109 | info[0] = '\0'; | 108 | info[0] = '\0'; |
110 | 109 | ||
111 | /* Get a packet from the client. */ | 110 | /* Get a packet from the client. */ |
112 | type = packet_read(&plen); | 111 | type = packet_read(); |
113 | 112 | ||
114 | /* Process the packet. */ | 113 | /* Process the packet. */ |
115 | switch (type) { | 114 | switch (type) { |
@@ -360,12 +359,11 @@ do_authentication(void) | |||
360 | { | 359 | { |
361 | Authctxt *authctxt; | 360 | Authctxt *authctxt; |
362 | struct passwd *pw; | 361 | struct passwd *pw; |
363 | int plen; | ||
364 | u_int ulen; | 362 | u_int ulen; |
365 | char *p, *user, *style = NULL; | 363 | char *p, *user, *style = NULL; |
366 | 364 | ||
367 | /* Get the name of the user that we wish to log in as. */ | 365 | /* Get the name of the user that we wish to log in as. */ |
368 | packet_read_expect(&plen, SSH_CMSG_USER); | 366 | packet_read_expect(SSH_CMSG_USER); |
369 | 367 | ||
370 | /* Get the user name. */ | 368 | /* Get the user name. */ |
371 | user = packet_get_string(&ulen); | 369 | user = packet_get_string(&ulen); |