View | Details | Raw Unified | Return to bug 2002
Collapse All | Expand All

(-)a/mux.c (-2 / +1 lines)
Lines 1195-1200 muxserver_listen(void) Link Here
1195
				close(muxserver_sock);
1195
				close(muxserver_sock);
1196
				muxserver_sock = -1;
1196
				muxserver_sock = -1;
1197
			}
1197
			}
1198
			xfree(orig_control_path);
1198
			xfree(options.control_path);
1199
			xfree(options.control_path);
1199
			options.control_path = NULL;
1200
			options.control_path = NULL;
1200
			options.control_master = SSHCTL_MASTER_NO;
1201
			options.control_master = SSHCTL_MASTER_NO;
Lines 1216-1222 muxserver_listen(void) Link Here
1216
		}
1217
		}
1217
		error("ControlSocket %s already exists, disabling multiplexing",
1218
		error("ControlSocket %s already exists, disabling multiplexing",
1218
		    orig_control_path);
1219
		    orig_control_path);
1219
		xfree(orig_control_path);
1220
		unlink(options.control_path);
1220
		unlink(options.control_path);
1221
		goto disable_mux_master;
1221
		goto disable_mux_master;
1222
	}
1222
	}
1223
- 

Return to bug 2002