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

Return to sshconnect.c CVS log

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

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.300 and 1.301

version 1.300, 2018/07/11 18:53:29

version 1.301, 2018/07/18 11:34:04

Line 40

#include "ssh.h"

#include "sshbuf.h"

#include "packet.h"

#include "uidswap.h"

#include "compat.h"

#include "sshkey.h"

#include "sshconnect.h"

Line 117

Line 116

if ((pid = fork()) == 0) {

char *argv[10];

/* Child. Permanently give up superuser privileges. */

permanently_drop_suid(original_real_uid);

close(sp[1]);

/* Redirect stdin and stdout. */

if (sp[0] != 0) {

Line 199

Line 195

if ((pid = fork()) == 0) {

char *argv[10];

/* Child. Permanently give up superuser privileges. */

permanently_drop_suid(original_real_uid);

/* Redirect stdin and stdout. */

close(pin[1]);

if (pin[0] != 0) {

Line 327

Line 320

static int

ssh_create_socket(int privileged, struct addrinfo *ai)

{

int sock, r, oerrno;

int sock, r;

struct sockaddr_storage bindaddr;

socklen_t bindaddrlen = 0;

struct addrinfo hints, *res = NULL;

Line 388

Line 381

ssh_gai_strerror(r));

goto fail;

}

if (bind(sock, (struct sockaddr *)&bindaddr, bindaddrlen) != 0) {

* If we are running as root and want to connect to a privileged

* port, bind our own socket to a privileged port.

if (privileged) {

PRIV_START;

r = bindresvport_sa(sock,

bindaddrlen == 0 ? NULL : (struct sockaddr *)&bindaddr);

oerrno = errno;

PRIV_END;

if (r < 0) {

error("bindresvport_sa %s: %s", ntop,

strerror(oerrno));

goto fail;

}

} else if (bind(sock, (struct sockaddr *)&bindaddr, bindaddrlen) != 0) {

error("bind %s: %s", ntop, strerror(errno));

goto fail;

}