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 @@
+20050504
+ - (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used
+   unix domain socket, so catch that too; from jakob@ ok dtucker@
+
 20050503
  - (dtucker) [canohost.c] normalise socket addresses returned by
    get_remote_hostname().  This means that IPv4 addresses in log messages
@@ -2470,4 +2474,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3752 2005/05/03 09:05:32 dtucker Exp $
+$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)
         old_umask = umask(0177);
         if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) {
                 control_fd = -1;
-                if (errno == EINVAL)
+                if (errno == EINVAL || errno == EADDRINUSE)
                         fatal("ControlSocket %s already exists",
                             options.control_path);
                 else