diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-28 16:40:05 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-28 16:40:05 +0000 |
commit | 4dccfa5fb73853e6c9281beac2c42a31391acdc7 (patch) | |
tree | 2a64c6b1e096010f2b5fd45a08f9878cac5d400e /serverloop.c | |
parent | 42717bf8fff94146edf43ea266113f1a54456c62 (diff) |
- (bal) OpenBSD CVS Update
- markus@cvs.openbsd.org 2000/12/28 14:25:51
[auth.h auth2.c]
count authentication failures only
- markus@cvs.openbsd.org 2000/12/28 14:25:03
[sshconnect.c]
fingerprint for MITM attacks, too.
- markus@cvs.openbsd.org 2000/12/28 12:03:57
[sshd.8 sshd.c]
document -D
- markus@cvs.openbsd.org 2000/12/27 14:19:21
[serverloop.c]
less chatty
- markus@cvs.openbsd.org 2000/12/27 12:34
[auth1.c sshconnect2.c sshd.c]
typo
- markus@cvs.openbsd.org 2000/12/27 12:30:19
[readconf.c readconf.h ssh.1 sshconnect.c]
new option: HostKeyAlias: allow the user to record the host key
under a different name. This is useful for ssh tunneling over
forwarded connections or if you run multiple sshd's on different
ports on the same machine.
- markus@cvs.openbsd.org 2000/12/27 11:51:53
[ssh.1 ssh.c]
multiple -t force pty allocation, document ORIGINAL_COMMAND
- markus@cvs.openbsd.org 2000/12/27 11:41:31
[sshd.8]
update for ssh-2
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c index 57e7f1f73..5fb0ed020 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.38 2000/12/19 23:17:58 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.39 2000/12/27 14:19:21 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "ssh.h" | 41 | #include "ssh.h" |
@@ -250,7 +250,7 @@ retry_select: | |||
250 | tvp = &tv; | 250 | tvp = &tv; |
251 | } | 251 | } |
252 | if (tvp!=NULL) | 252 | if (tvp!=NULL) |
253 | debug("tvp!=NULL kid %d mili %d", child_terminated, max_time_milliseconds); | 253 | debug2("tvp!=NULL kid %d mili %d", child_terminated, max_time_milliseconds); |
254 | 254 | ||
255 | /* Wait for something to happen, or the timeout to expire. */ | 255 | /* Wait for something to happen, or the timeout to expire. */ |
256 | ret = select(max_fd + 1, readset, writeset, NULL, tvp); | 256 | ret = select(max_fd + 1, readset, writeset, NULL, tvp); |