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 /sshd.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 'sshd.c')
-rw-r--r-- | sshd.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: sshd.c,v 1.106 2000/04/17 12:31:47 markus Exp $"); | 17 | RCSID("$OpenBSD: sshd.c,v 1.107 2000/04/19 07:05:50 deraadt Exp $"); |
18 | 18 | ||
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | #include "rsa.h" | 20 | #include "rsa.h" |
@@ -396,7 +396,8 @@ main(int ac, char **av) | |||
396 | { | 396 | { |
397 | extern char *optarg; | 397 | extern char *optarg; |
398 | extern int optind; | 398 | extern int optind; |
399 | int opt, sock_in = 0, sock_out = 0, newsock, i, fdsetsz, pid, on = 1; | 399 | int opt, sock_in = 0, sock_out = 0, newsock, i, fdsetsz, on = 1; |
400 | pid_t pid; | ||
400 | socklen_t fromlen; | 401 | socklen_t fromlen; |
401 | int silentrsa = 0; | 402 | int silentrsa = 0; |
402 | fd_set *fdset; | 403 | fd_set *fdset; |