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 @@
    - stevesk@cvs.openbsd.org 2007/04/14 22:01:58
      [auth2.c]
      remove unused macro; from Dmitry V. Levin <ldv@altlinux.org>
+   - stevesk@cvs.openbsd.org 2007/04/18 01:12:43
+     [sftp-server.c]
+     cast "%llu" format spec to (unsigned long long); do not assume a
+     u_int64_t arg is the same as 'unsigned long long'.
+     from Dmitry V. Levin <ldv@altlinux.org>
+     ok markus@ 'Yes, that looks correct' millert@
 
 20070509
  - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
@@ -2903,4 +2909,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.4661 2007/05/20 04:58:41 dtucker Exp $
+$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 @@
-/* $OpenBSD: sftp-server.c,v 1.71 2007/01/03 07:22:36 stevesk Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.72 2007/04/18 01:12:43 stevesk Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -319,7 +319,8 @@ handle_log_close(int handle, char *emsg)
                 logit("%s%sclose \"%s\" bytes read %llu written %llu",
                     emsg == NULL ? "" : emsg, emsg == NULL ? "" : " ",
                     handle_to_name(handle),
-                    handle_bytes_read(handle), handle_bytes_write(handle));
+                    (unsigned long long)handle_bytes_read(handle),
+                    (unsigned long long)handle_bytes_write(handle));
         } else {
                 logit("%s%sclosedir \"%s\"",
                     emsg == NULL ? "" : emsg, emsg == NULL ? "" : " ",
@@ -702,7 +703,8 @@ process_setstat(void)
         a = get_attrib();
         debug("request %u: setstat name \"%s\"", id, name);
         if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
-                logit("set \"%s\" size %llu", name, a->size);
+                logit("set \"%s\" size %llu",
+                    name, (unsigned long long)a->size);
                 ret = truncate(name, a->size);
                 if (ret == -1)
                         status = errno_to_portable(errno);
@@ -754,7 +756,8 @@ process_fsetstat(void)
                 char *name = handle_to_name(handle);
 
                 if (a->flags & SSH2_FILEXFER_ATTR_SIZE) {
-                        logit("set \"%s\" size %llu", name, a->size);
+                        logit("set \"%s\" size %llu",
+                            name, (unsigned long long)a->size);
                         ret = ftruncate(fd, a->size);
                         if (ret == -1)
                                 status = errno_to_portable(errno);