summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-03-16 20:56:16 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-03-16 20:56:16 +0000
commit20caed58266ef751b064092b7925dd0ae32fee9d (patch)
treec1f164bc96842ab5e5e303e180c7f74193510556 /usr.bin/ssh/sshd.c
parent8f373440e0f4ccbdc8c3653bc0273a9ac8cd0ae5 (diff)
-pedantic: signed vs. unsigned, void*-arithm, etc
Diffstat (limited to 'usr.bin/ssh/sshd.c')
-rw-r--r--usr.bin/ssh/sshd.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 248177c0c80..676610ef726 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -11,7 +11,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.91 2000/03/09 19:31:47 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.92 2000/03/16 20:56:15 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -1183,7 +1183,8 @@ void
do_authentication()
{
struct passwd *pw, pwcopy;
- int plen, ulen;
+ int plen;
+ unsigned int ulen;
char *user;
/* Get the name of the user that we wish to log in as. */
@@ -1270,7 +1271,9 @@ do_authloop(struct passwd * pw)
BIGNUM *n;
char *client_user, *password;
char user[1024];
- int plen, dlen, nlen, ulen, elen;
+ unsigned int dlen;
+ int plen, nlen, elen;
+ unsigned int ulen;
int type = 0;
void (*authlog) (const char *fmt,...) = verbose;
@@ -1551,7 +1554,7 @@ do_fake_authloop(char *user)
int plen;
int type = packet_read(&plen);
#ifdef SKEY
- int dlen;
+ unsigned int dlen;
char *password, *skeyinfo;
/* Try to send a fake s/key challenge. */
if (options.skey_authentication == 1 &&
@@ -1635,6 +1638,8 @@ do_authenticated(struct passwd * pw)
int row, col, xpixel, ypixel, screen;
char ttyname[64];
char *command, *term = NULL, *display = NULL, *proto = NULL, *data = NULL;
+ int plen;
+ unsigned int dlen;
int n_bytes;
/*
@@ -1658,7 +1663,6 @@ do_authenticated(struct passwd * pw)
* or a command.
*/
while (1) {
- int plen, dlen;
/* Get a packet from the client. */
type = packet_read(&plen);
@@ -1737,7 +1741,7 @@ do_authenticated(struct passwd * pw)
if (display)
packet_disconnect("Protocol error: X11 display already set.");
{
- int proto_len, data_len;
+ unsigned int proto_len, data_len;
proto = packet_get_string(&proto_len);
data = packet_get_string(&data_len);
packet_integrity_check(plen, 4 + proto_len + 4 + data_len + 4, type);
@@ -1819,7 +1823,7 @@ do_authenticated(struct passwd * pw)
goto do_forced_command;
/* Get command from the packet. */
{
- int dlen;
+ unsigned int dlen;
command = packet_get_string(&dlen);
debug("Executing command '%.500s'", command);
packet_integrity_check(plen, 4 + dlen, type);