summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 12:04:36 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 12:04:36 +1100
commitb24c2f8e33781be43702d8cfc69d4fbd0547e638 (patch)
treedfe40e177a22098ffe48fa50eb782ef2bd244935
parent2ecb6bd95d1f7d47d6071614be99339b290771e0 (diff)
- 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@
-rw-r--r--ChangeLog6
-rw-r--r--sshd.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0509ceef3..2be6f21d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -206,6 +206,10 @@
206 - djm@cvs.openbsd.org 2006/03/12 04:23:07 206 - djm@cvs.openbsd.org 2006/03/12 04:23:07
207 [ssh.c] 207 [ssh.c]
208 knf nit 208 knf nit
209 - djm@cvs.openbsd.org 2006/03/13 08:16:00
210 [sshd.c]
211 don't log that we are listening on a socket before the listen() call
212 actually succeeds, bz #1162 reported by Senthil Kumar; ok dtucker@
209 213
21020060313 21420060313
211 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 215 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4107,4 +4111,4 @@
4107 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4111 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4108 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4112 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4109 4113
4110$Id: ChangeLog,v 1.4199 2006/03/15 01:03:53 djm Exp $ 4114$Id: ChangeLog,v 1.4200 2006/03/15 01:04:36 djm Exp $
diff --git a/sshd.c b/sshd.c
index 40593ee2e..19c2d96ad 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.323 2006/02/20 17:19:54 stevesk Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.325 2006/03/13 08:16:00 djm Exp $");
46 46
47#include <sys/types.h> 47#include <sys/types.h>
48#ifdef HAVE_SYS_STAT_H 48#ifdef HAVE_SYS_STAT_H
@@ -1333,10 +1333,10 @@ main(int ac, char **av)
1333 num_listen_socks++; 1333 num_listen_socks++;
1334 1334
1335 /* Start listening on the port. */ 1335 /* Start listening on the port. */
1336 logit("Server listening on %s port %s.", ntop, strport);
1337 if (listen(listen_sock, SSH_LISTEN_BACKLOG) < 0) 1336 if (listen(listen_sock, SSH_LISTEN_BACKLOG) < 0)
1338 fatal("listen: %.100s", strerror(errno)); 1337 fatal("listen on [%s]:%s: %.100s",
1339 1338 ntop, strport, strerror(errno));
1339 logit("Server listening on %s port %s.", ntop, strport);
1340 } 1340 }
1341 freeaddrinfo(options.listen_addrs); 1341 freeaddrinfo(options.listen_addrs);
1342 1342