Commit a5a56874 authored by Matt Johnston's avatar Matt Johnston
Browse files

merge of 50848a51c2f9867bc10e81826190dbc326ea16b9

     and 84e3597daa468534c4a34231ae8761f841a0f5ae

--HG--
extra : convert_revision : 11ad05bc47809dbfe9510b78805f6ce52896d884
parents 1eb9209a af485f89
......@@ -166,8 +166,22 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
close(reserved[0]);
close(reserved[1]);
// uClinux needs to build the args here before vforking,
// otherwise we do it later on.
#ifdef __uClinux__
args.list[0] = ssh_program;
if (remuser != NULL)
addargs(&args, "-l%s", remuser);
addargs(&args, "%s", host);
addargs(&args, "%s", cmd);
#endif /* __uClinux__ */
/* Fork a child to execute the command on the remote host using ssh. */
#ifdef __uClinux__
do_cmd_pid = vfork();
#else
do_cmd_pid = fork();
#endif /* __uClinux__ */
if (do_cmd_pid == 0) {
/* Child. */
close(pin[1]);
......@@ -177,6 +191,7 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
close(pin[0]);
close(pout[1]);
#ifndef __uClinux__
args.list[0] = ssh_program;
if (remuser != NULL) {
addargs(&args, "-l");
......@@ -184,6 +199,7 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
}
addargs(&args, "%s", host);
addargs(&args, "%s", cmd);
#endif
execvp(ssh_program, args.list);
perror(ssh_program);
......@@ -192,6 +208,22 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
fprintf(stderr, "Fatal error: fork: %s\n", strerror(errno));
exit(1);
}
#ifdef __uClinux__
/* clean up command */
/* pop cmd */
free(args->list[--args->num]);
args->list[args->num]=NULL;
/* pop host */
free(args->list[--args->num-1]);
args->list[args->num]=NULL;
/* pop user */
if (remuser != NULL) {
free(args->list[--args->num-1]);
args->list[args->num]=NULL;
}
#endif /* __uClinux__
/* Parent. Close the other side, and return the local side. */
close(pin[0]);
*fdout = pin[1];
......
......@@ -623,7 +623,12 @@ static int noptycommand(struct Channel *channel, struct ChanSess *chansess) {
if (pipe(errfds) != 0)
return DROPBEAR_FAILURE;
#ifdef __uClinux__
pid = vfork();
#else
pid = fork();
#endif
if (pid < 0)
return DROPBEAR_FAILURE;
......@@ -714,7 +719,11 @@ static int ptycommand(struct Channel *channel, struct ChanSess *chansess) {
return DROPBEAR_FAILURE;
}
#ifdef __uClinux__
pid = vfork();
#else
pid = fork();
#endif
if (pid < 0)
return DROPBEAR_FAILURE;
......@@ -828,12 +837,16 @@ static void execchild(struct ChanSess *chansess) {
char * baseshell = NULL;
unsigned int i;
/* with uClinux we'll have vfork()ed, so don't want to overwrite the
* hostkey. can't think of a workaround to clear it */
#ifndef __uClinux__
/* wipe the hostkey */
sign_key_free(svr_opts.hostkey);
svr_opts.hostkey = NULL;
/* overwrite the prng state */
reseedrandom();
#endif
/* close file descriptors except stdin/stdout/stderr
* Need to be sure FDs are closed here to avoid reading files as root */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment