diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /sftp-server.c | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'sftp-server.c')
-rw-r--r-- | sftp-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.93 2010/12/04 00:18:01 djm Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.94 2011/06/17 21:46:16 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -68,7 +68,7 @@ Buffer iqueue; | |||
68 | Buffer oqueue; | 68 | Buffer oqueue; |
69 | 69 | ||
70 | /* Version of client */ | 70 | /* Version of client */ |
71 | int version; | 71 | u_int version; |
72 | 72 | ||
73 | /* Disable writes */ | 73 | /* Disable writes */ |
74 | int readonly; | 74 | int readonly; |
@@ -522,7 +522,7 @@ process_init(void) | |||
522 | Buffer msg; | 522 | Buffer msg; |
523 | 523 | ||
524 | version = get_int(); | 524 | version = get_int(); |
525 | verbose("received client version %d", version); | 525 | verbose("received client version %u", version); |
526 | buffer_init(&msg); | 526 | buffer_init(&msg); |
527 | buffer_put_char(&msg, SSH2_FXP_VERSION); | 527 | buffer_put_char(&msg, SSH2_FXP_VERSION); |
528 | buffer_put_int(&msg, SSH2_FILEXFER_VERSION); | 528 | buffer_put_int(&msg, SSH2_FILEXFER_VERSION); |