diff options
author | Damien Miller <djm@mindrot.org> | 2000-08-29 11:33:50 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-08-29 11:33:50 +1100 |
commit | caf6dd6d219e916e2784b3c884a7f2ce8784df37 (patch) | |
tree | aa41094fe8f805cd56791ff3d023a785fe1d1c29 /sshconnect.c | |
parent | 4e0f5e1ec9b6318ef251180dbca50eaa01f74536 (diff) |
- More OpenBSD updates:
- deraadt@cvs.openbsd.org 2000/08/24 15:46:59
[scp.c]
off_t in sink, to fix files > 2GB, i think, test is still running ;-)
- deraadt@cvs.openbsd.org 2000/08/25 10:10:06
[session.c]
Wall
- markus@cvs.openbsd.org 2000/08/26 04:33:43
[compat.c]
ssh.com-2.3.0
- markus@cvs.openbsd.org 2000/08/27 12:18:05
[compat.c]
compatibility with future ssh.com versions
- deraadt@cvs.openbsd.org 2000/08/27 21:50:55
[auth-krb4.c session.c ssh-add.c sshconnect.c uidswap.c]
print uid/gid as unsigned
- markus@cvs.openbsd.org 2000/08/28 13:51:00
[ssh.c]
enable -n and -f for ssh2
- markus@cvs.openbsd.org 2000/08/28 14:19:53
[ssh.c]
allow combination of -N and -f
- markus@cvs.openbsd.org 2000/08/28 14:20:56
[util.c]
util.c
- markus@cvs.openbsd.org 2000/08/28 14:22:02
[util.c]
undo
- markus@cvs.openbsd.org 2000/08/28 14:23:38
[util.c]
don't complain if setting NONBLOCK fails with ENODEV
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect.c b/sshconnect.c index 79b6856da..21eff6c6b 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: sshconnect.c,v 1.76 2000/06/17 20:30:10 markus Exp $"); | 11 | RCSID("$OpenBSD: sshconnect.c,v 1.77 2000/08/28 03:50:54 deraadt Exp $"); |
12 | 12 | ||
13 | #include <openssl/bn.h> | 13 | #include <openssl/bn.h> |
14 | #include <openssl/dsa.h> | 14 | #include <openssl/dsa.h> |
@@ -193,8 +193,8 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
193 | int gaierr; | 193 | int gaierr; |
194 | struct linger linger; | 194 | struct linger linger; |
195 | 195 | ||
196 | debug("ssh_connect: getuid %d geteuid %d anon %d", | 196 | debug("ssh_connect: getuid %u geteuid %u anon %d", |
197 | (int) getuid(), (int) geteuid(), anonymous); | 197 | (u_int) getuid(), (u_int) geteuid(), anonymous); |
198 | 198 | ||
199 | /* Get default port if port has not been set. */ | 199 | /* Get default port if port has not been set. */ |
200 | if (port == 0) { | 200 | if (port == 0) { |
@@ -669,7 +669,7 @@ ssh_login(int host_key_valid, RSA *own_host_key, const char *orighost, | |||
669 | /* Get local user name. Use it as server user if no user name was given. */ | 669 | /* Get local user name. Use it as server user if no user name was given. */ |
670 | pw = getpwuid(original_real_uid); | 670 | pw = getpwuid(original_real_uid); |
671 | if (!pw) | 671 | if (!pw) |
672 | fatal("User id %d not found from user database.", original_real_uid); | 672 | fatal("User id %u not found from user database.", original_real_uid); |
673 | local_user = xstrdup(pw->pw_name); | 673 | local_user = xstrdup(pw->pw_name); |
674 | server_user = options.user ? options.user : local_user; | 674 | server_user = options.user ? options.user : local_user; |
675 | 675 | ||