From aae6c614da614eb10ced16505f35410671c95d9d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 6 Dec 1999 11:47:28 +1100 Subject: - 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 --- serverloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'serverloop.c') diff --git a/serverloop.c b/serverloop.c index 683598ef8..94c211571 100644 --- a/serverloop.c +++ b/serverloop.c @@ -609,7 +609,7 @@ quit: /* Check if it matches the process we forked. */ if (wait_pid != pid) error("Strange, wait returned pid %d, expected %d", - wait_pid, pid); + wait_pid, pid); } /* We no longer want our SIGCHLD handler to be called. */ -- cgit v1.2.3