Import OpenSSH 3.6.1p2.

1 files changed, 8 insertions, 1 deletions

diff --git a/scp.c b/scp.c
index 42ebec0fe..35d4c5f71 100644
--- a/scp.c
+++ b/scp.c
@@ -554,9 +554,16 @@ syserr:			run_err("%s: %s", name, strerror(errno));
                                 goto next;
                 }
 #define FILEMODEMASK    (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
+#ifdef HAVE_LONG_LONG_INT
                 snprintf(buf, sizeof buf, "C%04o %lld %s\n",
                     (u_int) (stb.st_mode & FILEMODEMASK),
-                    (int64_t)stb.st_size, last);
+                    (long long)stb.st_size, last);
+#else
+                /* XXX: Handle integer overflow? */
+                snprintf(buf, sizeof buf, "C%04o %lu %s\n",
+                    (u_int) (stb.st_mode & FILEMODEMASK),
+                    (u_long) stb.st_size, last);
+#endif
                 if (verbose_mode) {
                         fprintf(stderr, "Sending file modes: %s", buf);
                 }