8f2528
diff -up openssh-7.4p1/mux.c.controlPath openssh-7.4p1/mux.c
8f2528
--- openssh-7.4p1/mux.c.controlPath	2017-05-04 14:49:44.629247946 +0200
8f2528
+++ openssh-7.4p1/mux.c	2017-05-04 14:52:54.955109022 +0200
8f2528
@@ -1290,6 +1290,12 @@ muxserver_listen(void)
8f2528
 	oerrno = errno;
8f2528
 	umask(old_umask);
8f2528
 	if (muxserver_sock < 0) {
8f2528
+		if (oerrno == ENAMETOOLONG) {
8f2528
+			/* the error is already logged from unix_listener() */
8f2528
+			error("ControlPath %s too long, "
8f2528
+			    "disabling multiplexing", options.control_path);
8f2528
+			goto disable_mux_master;
8f2528
+		}
8f2528
 		if (oerrno == EINVAL || oerrno == EADDRINUSE) {
8f2528
 			error("ControlSocket %s already exists, "
8f2528
 			    "disabling multiplexing", options.control_path);