summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp-server.c11
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8358f0446..f9bb0aba0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
3 - stevesk@cvs.openbsd.org 2007/04/14 22:01:58 3 - stevesk@cvs.openbsd.org 2007/04/14 22:01:58
4 [auth2.c] 4 [auth2.c]
5 remove unused macro; from Dmitry V. Levin <ldv@altlinux.org> 5 remove unused macro; from Dmitry V. Levin <ldv@altlinux.org>
6 - stevesk@cvs.openbsd.org 2007/04/18 01:12:43
7 [sftp-server.c]
8 cast "%llu" format spec to (unsigned long long); do not assume a
9 u_int64_t arg is the same as 'unsigned long long'.
10 from Dmitry V. Levin <ldv@altlinux.org>
11 ok markus@ 'Yes, that looks correct' millert@
6 12
720070509 1320070509
8 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h. 14 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
@@ -2903,4 +2909,4 @@
2903 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2909 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2904 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2910 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2905 2911
2906$Id: ChangeLog,v 1.4661 2007/05/20 04:58:41 dtucker Exp $ 2912$Id: ChangeLog,v 1.4662 2007/05/20 04:59:32 dtucker Exp $
diff --git a/sftp-server.c b/sftp-server.c
index 64777beff..d68584b52 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.71 2007/01/03 07:22:36 stevesk Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.72 2007/04/18 01:12:43 stevesk 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 *
@@ -319,7 +319,8 @@ handle_log_close(int handle, char *emsg)
319 logit("%s%sclose \"%s\" bytes read %llu written %llu", 319 logit("%s%sclose \"%s\" bytes read %llu written %llu",
320 emsg == NULL ? "" : emsg, emsg == NULL ? "" : " ", 320 emsg == NULL ? "" : emsg, emsg == NULL ? "" : " ",
321 handle_to_name(handle), 321 handle_to_name(handle),
322 handle_bytes_read(handle), handle_bytes_write(handle)); 322 (unsigned long long)handle_bytes_read(handle),
323 (unsigned long long)handle_bytes_write(handle));
323 } else { 324 } else {
324 logit("%s%sclosedir \"%s\"", 325 logit("%s%sclosedir \"%s\"",
325 emsg == NULL ? "" : emsg, emsg == NULL ? "" : " ", 326 emsg == NULL ? "" : emsg, emsg == NULL ? "" : " ",
@@ -702,7 +703,8 @@ process_setstat(void)
702 a = get_attrib(); 703 a = get_attrib();
703 debug("request %u: setstat name \"%s\"", id, name); 704 debug("request %u: setstat name \"%s\"", id, name);
704 if (a->flags & SSH2_FILEXFER_ATTR_SIZE) { 705 if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
705 logit("set \"%s\" size %llu", name, a->size); 706 logit("set \"%s\" size %llu",
707 name, (unsigned long long)a->size);
706 ret = truncate(name, a->size); 708 ret = truncate(name, a->size);
707 if (ret == -1) 709 if (ret == -1)
708 status = errno_to_portable(errno); 710 status = errno_to_portable(errno);
@@ -754,7 +756,8 @@ process_fsetstat(void)
754 char *name = handle_to_name(handle); 756 char *name = handle_to_name(handle);
755 757
756 if (a->flags & SSH2_FILEXFER_ATTR_SIZE) { 758 if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
757 logit("set \"%s\" size %llu", name, a->size); 759 logit("set \"%s\" size %llu",
760 name, (unsigned long long)a->size);
758 ret = ftruncate(fd, a->size); 761 ret = ftruncate(fd, a->size);
759 if (ret == -1) 762 if (ret == -1)
760 status = errno_to_portable(errno); 763 status = errno_to_portable(errno);