- deraadt@cvs.openbsd.org 2003/07/18 01:54:25

     [scp.c]
     userid is unsigned, but well, force it anyways; andrushock@korovino.net

diff --git a/ChangeLog b/ChangeLog
index 43f42843d80b347aa626689533b3f504269c330e..f645e683e462560a189c825b5b60313f6dce9f3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
    - markus@cvs.openbsd.org 2003/07/16 10:36:28
      [sshtty.c]
      clear IUCLC in enter_raw_mode; from rob@pitman.co.za; ok deraadt@, fgs@
+   - deraadt@cvs.openbsd.org 2003/07/18 01:54:25
+     [scp.c]
+     userid is unsigned, but well, force it anyways; andrushock@korovino.net
 
 20030714
  - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
@@ -708,4 +711,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2860 2003/07/19 09:56:18 dtucker Exp $
+$Id: ChangeLog,v 1.2861 2003/07/19 10:07:45 dtucker Exp $

diff --git a/scp.c b/scp.c
index 81690609dd2fd92e660ba0efe91dfaf55832532c..cf979f2501c7799aabc682f64f2422d50ffc602f 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.107 2003/06/28 16:23:06 deraadt Exp $");
+RCSID("$OpenBSD: scp.c,v 1.108 2003/07/18 01:54:25 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -298,7 +298,7 @@ main(int argc, char **argv)
        argv += optind;
 
        if ((pwd = getpwuid(userid = getuid())) == NULL)
-               fatal("unknown user %d", (int) userid);
+               fatal("unknown user %u", (u_int) userid);
 
        if (!isatty(STDERR_FILENO))
                showprogress = 0;