diff options
author | Damien Miller <djm@mindrot.org> | 2000-04-20 07:42:21 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-04-20 07:42:21 +1000 |
commit | 166fca8894807de71b741a779330bd23edfec013 (patch) | |
tree | 387371567ce5b3c89c52e18f3a22348f1456af8d /sshconnect.c | |
parent | 3ef692aa05a4b0d94a114be0826d32d0c8f67f1b (diff) |
- Sync with OpenBSD CVS:
[clientloop.c login.c serverloop.c ssh-agent.c ssh.h sshconnect.c sshd.c]
- pid_t
[session.c]
- remove bogus chan_read_failed. this could cause data
corruption (missing data) at end of a SSH2 session.
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 3c5c990f2..f58289e7b 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: sshconnect.c,v 1.68 2000/04/14 10:30:33 markus Exp $"); | 13 | RCSID("$OpenBSD: sshconnect.c,v 1.69 2000/04/19 07:05:50 deraadt Exp $"); |
14 | 14 | ||
15 | #include <openssl/bn.h> | 15 | #include <openssl/bn.h> |
16 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
@@ -62,7 +62,7 @@ ssh_proxy_connect(const char *host, u_short port, uid_t original_real_uid, | |||
62 | const char *cp; | 62 | const char *cp; |
63 | char *command_string; | 63 | char *command_string; |
64 | int pin[2], pout[2]; | 64 | int pin[2], pout[2]; |
65 | int pid; | 65 | pid_t pid; |
66 | char strport[NI_MAXSERV]; | 66 | char strport[NI_MAXSERV]; |
67 | 67 | ||
68 | /* Convert the port number into a string. */ | 68 | /* Convert the port number into a string. */ |