From 05ada1a67bf04f41c0ad9ed393ad8b46e32c3ba4 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Wed, 4 May 2005 05:33:09 +0000
Subject: [PATCH]  - (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@

---
 ChangeLog | 4 ++++
 ssh.c     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cfad7d12..b47ebe85 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
diff --git a/ssh.c b/ssh.c
index 703cb8bd..1f19229b 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
-- 
2.45.2