From: djm <djm>
Date: Wed, 15 Mar 2006 01:04:36 +0000 (+0000)
Subject:    - djm@cvs.openbsd.org 2006/03/13 08:16:00
X-Git-Tag: V_4_4_P1~371
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/9f51326889b110e0bd0732ecbae73046b966f3ed

   - 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@
---

diff --git a/ChangeLog b/ChangeLog
index 5152711a..66c11c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -206,6 +206,10 @@
    - djm@cvs.openbsd.org 2006/03/12 04:23:07
      [ssh.c]
      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
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
diff --git a/sshd.c b/sshd.c
index 40593ee2..19c2d96a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #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>
 #ifdef HAVE_SYS_STAT_H
@@ -1333,10 +1333,10 @@ main(int ac, char **av)
 			num_listen_socks++;
 
 			/* Start listening on the port. */
-			logit("Server listening on %s port %s.", ntop, strport);
 			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);