- 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
This commit is contained in:
parent
8f0bf237d4
commit
f145a5be1c
|
@ -13,6 +13,10 @@
|
||||||
[log.c log.h monitor.c monitor.h monitor_wrap.c monitor_wrap.h sshd.c]
|
[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
|
make the pre-auth privsep slave log via a socketpair shared with the
|
||||||
monitor rather than /var/empty/dev/log; ok dtucker@ deraadt@ markus@
|
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
|
20110603
|
||||||
- (dtucker) [README version.h contrib/caldera/openssh.spec
|
- (dtucker) [README version.h contrib/caldera/openssh.spec
|
||||||
|
|
|
@ -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.
|
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
|
||||||
*
|
*
|
||||||
|
@ -68,7 +68,7 @@ Buffer iqueue;
|
||||||
Buffer oqueue;
|
Buffer oqueue;
|
||||||
|
|
||||||
/* Version of client */
|
/* Version of client */
|
||||||
int version;
|
u_int version;
|
||||||
|
|
||||||
/* Disable writes */
|
/* Disable writes */
|
||||||
int readonly;
|
int readonly;
|
||||||
|
@ -522,7 +522,7 @@ process_init(void)
|
||||||
Buffer msg;
|
Buffer msg;
|
||||||
|
|
||||||
version = get_int();
|
version = get_int();
|
||||||
verbose("received client version %d", version);
|
verbose("received client version %u", version);
|
||||||
buffer_init(&msg);
|
buffer_init(&msg);
|
||||||
buffer_put_char(&msg, SSH2_FXP_VERSION);
|
buffer_put_char(&msg, SSH2_FXP_VERSION);
|
||||||
buffer_put_int(&msg, SSH2_FILEXFER_VERSION);
|
buffer_put_int(&msg, SSH2_FILEXFER_VERSION);
|
||||||
|
|
Loading…
Reference in New Issue