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

Return to readconf.c CVS log

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

version 1.242, 2015/10/07 15:59:12

version 1.243, 2015/10/25 23:14:03

Line 430

static int

execute_in_shell(const char *cmd)

{

char *shell, *command_string;

char *shell;

pid_t pid;

int devnull, status;

extern uid_t original_real_uid;

Line 438

if ((shell = getenv("SHELL")) == NULL)

shell = _PATH_BSHELL;

* Use "exec" to avoid "sh -c" processes on some platforms

* (e.g. Solaris)

xasprintf(&command_string, "exec %s", cmd);

/* Need this to redirect subprocess stdin/out */

if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1)

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

Line 468

Line 462

argv[0] = shell;

argv[1] = "-c";

argv[2] = command_string;

argv[2] = cmd;

argv[3] = NULL;

execv(argv[0], argv);

Line 483

Line 477

fatal("%s: fork: %.100s", __func__, strerror(errno));

close(devnull);

free(command_string);

while (waitpid(pid, &status, 0) == -1) {

if (errno != EINTR && errno != EAGAIN)