- djm@cvs.openbsd.org 2006/03/13 08:16:00

[sshd.c]
     don't log that we are listening on a socket before the listen() call
     actually succeeds, bz #1162 reported by Senthil Kumar; ok dtucker@
This commit is contained in:
Damien Miller 2006-03-15 12:04:36 +11:00
parent 2ecb6bd95d
commit b24c2f8e33
2 changed files with 9 additions and 5 deletions

View File

@ -206,6 +206,10 @@
- djm@cvs.openbsd.org 2006/03/12 04:23:07 - djm@cvs.openbsd.org 2006/03/12 04:23:07
[ssh.c] [ssh.c]
knf nit knf nit
- djm@cvs.openbsd.org 2006/03/13 08:16:00
[sshd.c]
don't log that we are listening on a socket before the listen() call
actually succeeds, bz #1162 reported by Senthil Kumar; ok dtucker@
20060313 20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@ -4107,4 +4111,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4199 2006/03/15 01:03:53 djm Exp $ $Id: ChangeLog,v 1.4200 2006/03/15 01:04:36 djm Exp $

8
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.323 2006/02/20 17:19:54 stevesk Exp $"); RCSID("$OpenBSD: sshd.c,v 1.325 2006/03/13 08:16:00 djm Exp $");
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
@ -1333,10 +1333,10 @@ main(int ac, char **av)
num_listen_socks++; num_listen_socks++;
/* Start listening on the port. */ /* Start listening on the port. */
logit("Server listening on %s port %s.", ntop, strport);
if (listen(listen_sock, SSH_LISTEN_BACKLOG) < 0) if (listen(listen_sock, SSH_LISTEN_BACKLOG) < 0)
fatal("listen: %.100s", strerror(errno)); fatal("listen on [%s]:%s: %.100s",
ntop, strport, strerror(errno));
logit("Server listening on %s port %s.", ntop, strport);
} }
freeaddrinfo(options.listen_addrs); freeaddrinfo(options.listen_addrs);