summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-06-20 06:42:51 +0200
committerDamien Miller <djm@mindrot.org>2011-06-20 06:42:51 +0200
commitf145a5be1c7d7849c3c2699d32d253b26d0c895a (patch)
tree5b45ad00a11c430c2125db5dab4beb7e4d6beb0a
parent - djm@cvs.openbsd.org 2011/06/17 21:44:31 (diff)
downloadopenssh-f145a5be1c7d7849c3c2699d32d253b26d0c895a.tar.xz
openssh-f145a5be1c7d7849c3c2699d32d253b26d0c895a.zip
- djm@cvs.openbsd.org 2011/06/17 21:46:16
[sftp-server.c] the protocol version should be unsigned; bz#1913 reported by mb AT smartftp.com
-rw-r--r--ChangeLog4
-rw-r--r--sftp-server.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d41208092..15320284c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
[log.c log.h monitor.c monitor.h monitor_wrap.c monitor_wrap.h sshd.c]
make the pre-auth privsep slave log via a socketpair shared with the
monitor rather than /var/empty/dev/log; ok dtucker@ deraadt@ markus@
+ - djm@cvs.openbsd.org 2011/06/17 21:46:16
+ [sftp-server.c]
+ the protocol version should be unsigned; bz#1913 reported by mb AT
+ smartftp.com
20110603
- (dtucker) [README version.h contrib/caldera/openssh.spec
diff --git a/sftp-server.c b/sftp-server.c
index b268d0883..9d01c7d79 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.93 2010/12/04 00:18:01 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.94 2011/06/17 21:46:16 djm Exp $ */
/*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
*
@@ -68,7 +68,7 @@ Buffer iqueue;
Buffer oqueue;
/* Version of client */
-int version;
+u_int version;
/* Disable writes */
int readonly;
@@ -522,7 +522,7 @@ process_init(void)
Buffer msg;
version = get_int();
- verbose("received client version %d", version);
+ verbose("received client version %u", version);
buffer_init(&msg);
buffer_put_char(&msg, SSH2_FXP_VERSION);
buffer_put_int(&msg, SSH2_FILEXFER_VERSION);