diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-07-19 20:07:45 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-07-19 20:07:45 +1000 |
commit | 03a29baf35e1a26aaa0eba37f53c97010d5f56af (patch) | |
tree | 0e92970602a6e0387877fb2d3e81142257bb9f3c | |
parent | 538d180395609462130ef28e92cbb05f3a987dcb (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-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -12,6 +12,9 @@ | |||
12 | - markus@cvs.openbsd.org 2003/07/16 10:36:28 | 12 | - markus@cvs.openbsd.org 2003/07/16 10:36:28 |
13 | [sshtty.c] | 13 | [sshtty.c] |
14 | clear IUCLC in enter_raw_mode; from rob@pitman.co.za; ok deraadt@, fgs@ | 14 | clear IUCLC in enter_raw_mode; from rob@pitman.co.za; ok deraadt@, fgs@ |
15 | - deraadt@cvs.openbsd.org 2003/07/18 01:54:25 | ||
16 | [scp.c] | ||
17 | userid is unsigned, but well, force it anyways; andrushock@korovino.net | ||
15 | 18 | ||
16 | 20030714 | 19 | 20030714 |
17 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare | 20 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare |
@@ -708,4 +711,4 @@ | |||
708 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 711 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
709 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 712 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
710 | 713 | ||
711 | $Id: ChangeLog,v 1.2860 2003/07/19 09:56:18 dtucker Exp $ | 714 | $Id: ChangeLog,v 1.2861 2003/07/19 10:07:45 dtucker Exp $ |
@@ -71,7 +71,7 @@ | |||
71 | */ | 71 | */ |
72 | 72 | ||
73 | #include "includes.h" | 73 | #include "includes.h" |
74 | RCSID("$OpenBSD: scp.c,v 1.107 2003/06/28 16:23:06 deraadt Exp $"); | 74 | RCSID("$OpenBSD: scp.c,v 1.108 2003/07/18 01:54:25 deraadt Exp $"); |
75 | 75 | ||
76 | #include "xmalloc.h" | 76 | #include "xmalloc.h" |
77 | #include "atomicio.h" | 77 | #include "atomicio.h" |
@@ -298,7 +298,7 @@ main(int argc, char **argv) | |||
298 | argv += optind; | 298 | argv += optind; |
299 | 299 | ||
300 | if ((pwd = getpwuid(userid = getuid())) == NULL) | 300 | if ((pwd = getpwuid(userid = getuid())) == NULL) |
301 | fatal("unknown user %d", (int) userid); | 301 | fatal("unknown user %u", (u_int) userid); |
302 | 302 | ||
303 | if (!isatty(STDERR_FILENO)) | 303 | if (!isatty(STDERR_FILENO)) |
304 | showprogress = 0; | 304 | showprogress = 0; |