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

diff --git a/ChangeLog b/ChangeLog
index cfad7d12335f07c1c8a77b9a83280236370e7870..b47ebe85129525c235a8c388c41f877c82dafa0f 100644 (file)
--- 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

diff --git a/ssh.c b/ssh.c
index 703cb8bd3168e19ae9ac20b321674b0565bdc4c5..1f19229b717a98bb2b941d0c152d53455708cf2e 100644 (file)
--- 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