diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-06-09 23:06:55 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-06-09 23:06:55 +1000 |
| commit | 3463acaebfe90c10d22c0baaff556559bfd66fd6 (patch) | |
| tree | ed4b829c632ba241fb21ad2e7a539ee4494d790a | |
| parent | 7b598892be09a9da2855b57086dddce502a150dc (diff) | |
- dtucker@cvs.openbsd.org 2008/06/09 13:02:39
Extend 32bit -> 64bit values for statvfs extension missed in previous
commit.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sftp-server.c | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -10,6 +10,9 @@ client's. Also extends the sizes of the remaining 32bit wire format to 64bit, 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 - (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 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 $ diff --git a/sftp-server.c b/sftp-server.c index fbf62098..4022b93b 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -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. * @@ -496,8 +496,8 @@ send_statvfs(u_int32_t id, struct statvfs *st) buffer_init(&msg); buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY); buffer_put_int(&msg, id); - buffer_put_int(&msg, st->f_bsize); - buffer_put_int(&msg, st->f_frsize); + buffer_put_int64(&msg, st->f_bsize); + buffer_put_int64(&msg, st->f_frsize); buffer_put_int64(&msg, st->f_blocks); buffer_put_int64(&msg, st->f_bfree); 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_favail); buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid)); - buffer_put_int(&msg, flag); - buffer_put_int(&msg, st->f_namemax); + buffer_put_int64(&msg, flag); + buffer_put_int64(&msg, st->f_namemax); send_msg(&msg); buffer_free(&msg); } |