summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bcbc5f642..bee07796c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120050504
2 - (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used
3 unix domain socket, so catch that too; from jakob@ ok dtucker@
4
120050503 520050503
2 - (dtucker) [canohost.c] normalise socket addresses returned by 6 - (dtucker) [canohost.c] normalise socket addresses returned by
3 get_remote_hostname(). This means that IPv4 addresses in log messages 7 get_remote_hostname(). This means that IPv4 addresses in log messages
@@ -2470,4 +2474,4 @@
2470 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2474 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2471 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2475 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2472 2476
2473$Id: ChangeLog,v 1.3752 2005/05/03 09:05:32 dtucker Exp $ 2477$Id: ChangeLog,v 1.3753 2005/05/04 05:33:09 djm Exp $
diff --git a/ssh.c b/ssh.c
index 703cb8bd3..1f19229b7 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1095,7 +1095,7 @@ ssh_control_listener(void)
1095 old_umask = umask(0177); 1095 old_umask = umask(0177);
1096 if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { 1096 if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) {
1097 control_fd = -1; 1097 control_fd = -1;
1098 if (errno == EINVAL) 1098 if (errno == EINVAL || errno == EADDRINUSE)
1099 fatal("ControlSocket %s already exists", 1099 fatal("ControlSocket %s already exists",
1100 options.control_path); 1100 options.control_path);
1101 else 1101 else