Attachment 1790 Details for Bug 1711 – patch to re-create mux control socket

[patch] patch to re-create mux control socket

mux.c.diff (text/plain), 1.22 KB, created by Andrew O. Shadoura on 2010-02-10 04:07:09 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew O. Shadoura

Created: 2010-02-10 04:07:09 AEDT

Size: 1.22 KB

patch

obsolete

>--- openssh-5.3p1.orig/mux.c	2010-02-09 14:35:32.000000000 +0200
>+++ openssh-5.3p1/mux.c	2010-02-09 11:03:25.000000000 +0200
>@@ -143,16 +143,23 @@
> 
> 	old_umask = umask(0177);
> 	if (bind(muxserver_sock, (struct sockaddr *)&addr, addr_len) == -1) {
>-		muxserver_sock = -1;
> 		if (errno == EINVAL || errno == EADDRINUSE) {
> 			error("ControlSocket %s already exists, "
>-			    "disabling multiplexing", options.control_path);
>-			close(muxserver_sock);
>-			muxserver_sock = -1;
>-			xfree(options.control_path);
>-			options.control_path = NULL;
>-			options.control_master = SSHCTL_MASTER_NO;
>-			return;
>+			    "recreating socket", options.control_path);
>+			unlink(options.control_path);
>+			if (bind(muxserver_sock, (struct sockaddr *)&addr, addr_len) == -1) {
>+				if (errno == EINVAL || errno == EADDRINUSE) {
>+					error("ControlSocket %s already exists, "
>+							"disabling multiplexing", options.control_path);
>+					close(muxserver_sock);
>+					muxserver_sock = -1;
>+					xfree(options.control_path);
>+					options.control_path = NULL;
>+					options.control_master = SSHCTL_MASTER_NO;
>+					return;
>+				} else
>+					fatal("%s bind(): %s", __func__, strerror(errno));
>+			}
> 		} else
> 			fatal("%s bind(): %s", __func__, strerror(errno));
> 	}

Actions: View | Diff

Attachments on bug 1711: 1790