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 /session.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 'session.c')
-rw-r--r-- | session.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: session.c,v 1.29 2000/08/21 16:23:31 millert Exp $"); | 11 | RCSID("$OpenBSD: session.c,v 1.31 2000/08/28 03:50:54 deraadt Exp $"); |
12 | 12 | ||
13 | #include "xmalloc.h" | 13 | #include "xmalloc.h" |
14 | #include "ssh.h" | 14 | #include "ssh.h" |
@@ -1014,7 +1014,7 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1014 | #endif /* HAVE_OSF_SIA */ | 1014 | #endif /* HAVE_OSF_SIA */ |
1015 | 1015 | ||
1016 | if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) | 1016 | if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) |
1017 | fatal("Failed to set uids to %d.", (int) pw->pw_uid); | 1017 | fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); |
1018 | } | 1018 | } |
1019 | /* | 1019 | /* |
1020 | * Get the shell from the password data. An empty shell field is | 1020 | * Get the shell from the password data. An empty shell field is |
@@ -1229,7 +1229,7 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1229 | if (screen != NULL) | 1229 | if (screen != NULL) |
1230 | fprintf(stderr, | 1230 | fprintf(stderr, |
1231 | "Adding %.*s/unix%s %s %s\n", | 1231 | "Adding %.*s/unix%s %s %s\n", |
1232 | screen-display, display, | 1232 | (int)(screen-display), display, |
1233 | screen, auth_proto, auth_data); | 1233 | screen, auth_proto, auth_data); |
1234 | } | 1234 | } |
1235 | snprintf(cmd, sizeof cmd, "%s -q -", | 1235 | snprintf(cmd, sizeof cmd, "%s -q -", |
@@ -1240,7 +1240,7 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1240 | auth_proto, auth_data); | 1240 | auth_proto, auth_data); |
1241 | if (screen != NULL) | 1241 | if (screen != NULL) |
1242 | fprintf(f, "add %.*s/unix%s %s %s\n", | 1242 | fprintf(f, "add %.*s/unix%s %s %s\n", |
1243 | screen-display, display, | 1243 | (int)(screen-display), display, |
1244 | screen, auth_proto, auth_data); | 1244 | screen, auth_proto, auth_data); |
1245 | pclose(f); | 1245 | pclose(f); |
1246 | } else { | 1246 | } else { |