diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
commit | aae6c614da614eb10ced16505f35410671c95d9d (patch) | |
tree | 441e578781d38e7de4c5f609a4f86695d937e640 /serverloop.c | |
parent | dc33fc3910552c82518503b581efc1a51192fa76 (diff) |
- Merged OpenBSD CVS changes:
- [auth-krb4.c auth-passwd.c auth-skey.c ssh.
move skey-auth from auth-passwd.c to auth-s
- [auth-rsa.c]
warn only about mismatch if key is _used_
warn about keysize-mismatch with log() not
channels.c readconf.c readconf.h ssh.c ssh.
ports are u_short
- [hostfile.c]
indent, shorter warning
- [nchan.c]
use error() for internal errors
- [packet.c]
set loglevel for SSH_MSG_DISCONNECT to log(
serverloop.c
indent
- [ssh-add.1 ssh-add.c ssh.h]
document , reasonable default
- [ssh.1]
CheckHostIP is not available for connects v
- [sshconnect.c]
typo
easier to read client code for passwd and s
turn of checkhostip for proxy connects, sin
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/serverloop.c b/serverloop.c index 683598ef8..94c211571 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -609,7 +609,7 @@ quit: | |||
609 | /* Check if it matches the process we forked. */ | 609 | /* Check if it matches the process we forked. */ |
610 | if (wait_pid != pid) | 610 | if (wait_pid != pid) |
611 | error("Strange, wait returned pid %d, expected %d", | 611 | error("Strange, wait returned pid %d, expected %d", |
612 | wait_pid, pid); | 612 | wait_pid, pid); |
613 | } | 613 | } |
614 | 614 | ||
615 | /* We no longer want our SIGCHLD handler to be called. */ | 615 | /* We no longer want our SIGCHLD handler to be called. */ |