summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-07-19 20:07:45 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-07-19 20:07:45 +1000
commit03a29baf35e1a26aaa0eba37f53c97010d5f56af (patch)
tree0e92970602a6e0387877fb2d3e81142257bb9f3c
parent538d180395609462130ef28e92cbb05f3a987dcb (diff)
- deraadt@cvs.openbsd.org 2003/07/18 01:54:25
[scp.c] userid is unsigned, but well, force it anyways; andrushock@korovino.net
-rw-r--r--ChangeLog5
-rw-r--r--scp.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 43f42843..f645e683 100644
--- 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 81690609..cf979f25 100644
--- 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;