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 @@ | |||
10 | client's. | 10 | client's. |
11 | Also extends the sizes of the remaining 32bit wire format to 64bit, | 11 | Also extends the sizes of the remaining 32bit wire format to 64bit, |
12 | they're specified as unsigned long in the standard. | 12 | they're specified as unsigned long in the standard. |
13 | - dtucker@cvs.openbsd.org 2008/06/09 13:02:39 | ||
14 | Extend 32bit -> 64bit values for statvfs extension missed in previous | ||
15 | commit. | ||
13 | 16 | ||
14 | 20080608 | 17 | 20080608 |
15 | - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c | 18 | - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c |
@@ -4076,4 +4079,4 @@ | |||
4076 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4079 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4077 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4080 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4078 | 4081 | ||
4079 | $Id: ChangeLog,v 1.4946 2008/06/09 12:49:36 dtucker Exp $ | 4082 | $Id: ChangeLog,v 1.4947 2008/06/09 13:06:55 dtucker Exp $ |
diff --git a/sftp-server.c b/sftp-server.c index fbf620989..4022b93b6 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.82 2008/06/08 17:04:41 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.83 2008/06/09 13:02:39 dtucker 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 | * |
@@ -496,8 +496,8 @@ send_statvfs(u_int32_t id, struct statvfs *st) | |||
496 | buffer_init(&msg); | 496 | buffer_init(&msg); |
497 | buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY); | 497 | buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY); |
498 | buffer_put_int(&msg, id); | 498 | buffer_put_int(&msg, id); |
499 | buffer_put_int(&msg, st->f_bsize); | 499 | buffer_put_int64(&msg, st->f_bsize); |
500 | buffer_put_int(&msg, st->f_frsize); | 500 | buffer_put_int64(&msg, st->f_frsize); |
501 | buffer_put_int64(&msg, st->f_blocks); | 501 | buffer_put_int64(&msg, st->f_blocks); |
502 | buffer_put_int64(&msg, st->f_bfree); | 502 | buffer_put_int64(&msg, st->f_bfree); |
503 | buffer_put_int64(&msg, st->f_bavail); | 503 | buffer_put_int64(&msg, st->f_bavail); |
@@ -505,8 +505,8 @@ send_statvfs(u_int32_t id, struct statvfs *st) | |||
505 | buffer_put_int64(&msg, st->f_ffree); | 505 | buffer_put_int64(&msg, st->f_ffree); |
506 | buffer_put_int64(&msg, st->f_favail); | 506 | buffer_put_int64(&msg, st->f_favail); |
507 | buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid)); | 507 | buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid)); |
508 | buffer_put_int(&msg, flag); | 508 | buffer_put_int64(&msg, flag); |
509 | buffer_put_int(&msg, st->f_namemax); | 509 | buffer_put_int64(&msg, st->f_namemax); |
510 | send_msg(&msg); | 510 | send_msg(&msg); |
511 | buffer_free(&msg); | 511 | buffer_free(&msg); |
512 | } | 512 | } |