Jan F. Chadima 6a2cfe2
diff -up openssh-5.8p2/mux.c.remove_stale openssh-5.8p2/mux.c
Jan F. Chadima 6a2cfe2
--- openssh-5.8p2/mux.c.remove_stale	2011-01-14 02:01:32.000000000 +0100
Jan F. Chadima 6a2cfe2
+++ openssh-5.8p2/mux.c	2011-06-09 15:27:42.556360291 +0200
Jan F. Chadima 6a2cfe2
@@ -1867,6 +1867,9 @@ muxclient(const char *path)
Jan F. Chadima 6a2cfe2
 			unlink(path);
Jan F. Chadima 6a2cfe2
 		} else if (errno == ENOENT) {
Jan F. Chadima 6a2cfe2
 			debug("Control socket \"%.100s\" does not exist", path);
Jan F. Chadima 6a2cfe2
+		} else if (errno == ECONNREFUSED) {
Jan F. Chadima 6a2cfe2
+			debug("Removing stale control socket \"%.100s\"", path);
Jan F. Chadima 6a2cfe2
+			unlink(path);
Jan F. Chadima 6a2cfe2
 		} else {
Jan F. Chadima 6a2cfe2
 			error("Control socket connect(%.100s): %s", path,
Jan F. Chadima 6a2cfe2
 			    strerror(errno));