Extend 32bit -> 64bit values for statvfs extension missed in previous
     commit.
This commit is contained in:
Darren Tucker 2008-06-09 23:06:55 +10:00
parent 7b598892be
commit 3463acaebf
2 changed files with 9 additions and 6 deletions

View File

@ -10,6 +10,9 @@
client's. client's.
Also extends the sizes of the remaining 32bit wire format to 64bit, Also extends the sizes of the remaining 32bit wire format to 64bit,
they're specified as unsigned long in the standard. they're specified as unsigned long in the standard.
- dtucker@cvs.openbsd.org 2008/06/09 13:02:39
Extend 32bit -> 64bit values for statvfs extension missed in previous
commit.
20080608 20080608
- (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c
@ -4076,4 +4079,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4946 2008/06/09 12:49:36 dtucker Exp $ $Id: ChangeLog,v 1.4947 2008/06/09 13:06:55 dtucker Exp $

View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-server.c,v 1.82 2008/06/08 17:04:41 dtucker Exp $ */ /* $OpenBSD: sftp-server.c,v 1.83 2008/06/09 13:02:39 dtucker Exp $ */
/* /*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
* *
@ -496,8 +496,8 @@ send_statvfs(u_int32_t id, struct statvfs *st)
buffer_init(&msg); buffer_init(&msg);
buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY); buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY);
buffer_put_int(&msg, id); buffer_put_int(&msg, id);
buffer_put_int(&msg, st->f_bsize); buffer_put_int64(&msg, st->f_bsize);
buffer_put_int(&msg, st->f_frsize); buffer_put_int64(&msg, st->f_frsize);
buffer_put_int64(&msg, st->f_blocks); buffer_put_int64(&msg, st->f_blocks);
buffer_put_int64(&msg, st->f_bfree); buffer_put_int64(&msg, st->f_bfree);
buffer_put_int64(&msg, st->f_bavail); buffer_put_int64(&msg, st->f_bavail);
@ -505,8 +505,8 @@ send_statvfs(u_int32_t id, struct statvfs *st)
buffer_put_int64(&msg, st->f_ffree); buffer_put_int64(&msg, st->f_ffree);
buffer_put_int64(&msg, st->f_favail); buffer_put_int64(&msg, st->f_favail);
buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid)); buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid));
buffer_put_int(&msg, flag); buffer_put_int64(&msg, flag);
buffer_put_int(&msg, st->f_namemax); buffer_put_int64(&msg, st->f_namemax);
send_msg(&msg); send_msg(&msg);
buffer_free(&msg); buffer_free(&msg);
} }