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

Return to ssh.c CVS log

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

version 1.236, 2005/04/21 11:47:19

version 1.237, 2005/04/26 13:08:37

Line 606

options.control_path, original_real_uid);

}

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

control_client(options.control_path); /* This doesn't return */

control_client(options.control_path);

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

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

Line 1278

extern char **environ;

u_int flags;

if (stdin_null_flag) {

if ((fd = open(_PATH_DEVNULL, O_RDONLY)) == -1)

fatal("open(/dev/null): %s", strerror(errno));

if (dup2(fd, STDIN_FILENO) == -1)

fatal("dup2: %s", strerror(errno));

if (fd > STDERR_FILENO)

close(fd);

}

memset(&addr, '\0', sizeof(addr));

addr.sun_family = AF_UNIX;

addr.sun_len = offsetof(struct sockaddr_un, sun_path) +

Line 1299

Line 1290

if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)

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

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

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

fatal("Couldn't connect to %s: %s", path, strerror(errno));

debug("Couldn't connect to %s: %s", path, strerror(errno));

close(sock);

return;

}