src/usr.bin/ssh/ssh.c - diff

Return to ssh.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.239, 2005/05/10 10:30:43

version 1.240, 2005/05/27 08:30:37

Line 145

int control_fd = -1;

/* Multiplexing control command */

static u_int mux_command = SSHMUX_COMMAND_OPEN;

static u_int mux_command = 0;

/* Only used in control client mode */

volatile sig_atomic_t control_client_terminate = 0;

Line 605

options.control_path = tilde_expand_filename(

options.control_path, original_real_uid);

}

if (options.control_path != NULL && options.control_master == 0)

if (mux_command != 0 && options.control_path == NULL)

fatal("No ControlPath specified for \"-O\" command");

if (options.control_path != NULL && options.control_master == 0) {

if (mux_command == 0)

mux_command = SSHMUX_COMMAND_OPEN;

control_client(options.control_path);

}

/* Open a connection to the remote host. */

if (ssh_connect(host, &hostaddr, options.port,

Line 1291

Line 1296

fatal("%s socket(): %s", __func__, strerror(errno));

if (connect(sock, (struct sockaddr*)&addr, addr.sun_len) == -1) {

if (mux_command != SSHMUX_COMMAND_OPEN) {

fatal("Control socket connect(%.100s): %s", path,

strerror(errno));

}

if (errno == ENOENT)

debug("Control socket \"%.100s\" does not exist", path);

else {