char skip_argument[1];
-pid_t pipespawnv_passwd(char *prog, int pipedef,
+pid_t pipespawnv_passwd(char *prog, int pipedef, int need_root,
int *stdinfd, int *stdoutfd, int *stderrfd,
char **my_argv);
pipespawn(
char * prog,
int pipedef,
+ int need_root,
int * stdinfd,
int * stdoutfd,
int * stderrfd,
}
arglist_end(ap);
- pid = pipespawnv_passwd(prog, pipedef, stdinfd, stdoutfd, stderrfd, argv);
+ pid = pipespawnv_passwd(prog, pipedef, need_root,
+ stdinfd, stdoutfd, stderrfd, argv);
amfree(argv);
return pid;
}
pipespawnv(
char * prog,
int pipedef,
+ int need_root,
int * stdinfd,
int * stdoutfd,
int * stderrfd,
char ** my_argv)
{
- return pipespawnv_passwd(prog, pipedef, stdinfd, stdoutfd, stderrfd,
+ return pipespawnv_passwd(prog, pipedef, need_root,
+ stdinfd, stdoutfd, stderrfd,
my_argv);
}
pipespawnv_passwd(
char * prog,
int pipedef,
+ int need_root,
int * stdinfd,
int * stdoutfd,
int * stderrfd,
char ** my_argv)
{
- int argc;
pid_t pid;
int i, inpipe[2], outpipe[2], errpipe[2], passwdpipe[2];
char number[NUM_STR_SIZE];
memset(outpipe, -1, SIZEOF(outpipe));
memset(errpipe, -1, SIZEOF(errpipe));
memset(passwdpipe, -1, SIZEOF(passwdpipe));
- argc = 0;
cmdline = stralloc(prog);
for(arg = my_argv; *arg != NULL; arg++) {
if (*arg != skip_argument) {
- argc++;
quoted = quote_string(*arg);
cmdline = vstrextend(&cmdline, " ", quoted, NULL);
amfree(quoted);
}
break;
case 0: /* child process */
+ debug_dup_stderr_to_debug();
if ((pipedef & STDIN_PIPE) != 0) {
aclose(inpipe[1]); /* close output side of pipe */
} else {
* Shift the pipes to the standard file descriptors as requested.
*/
if(dup2(inpipe[0], 0) == -1) {
- error(_("error [spawn %s: dup2 in: %s]"), prog, strerror(errno));
+ g_fprintf(stderr, "error [spawn %s: dup2 in: %s]", prog, strerror(errno));
+ exit(1);
/*NOTREACHED*/
}
if(dup2(outpipe[1], 1) == -1) {
- error(_("error [spawn %s: dup2 out: %s]"), prog, strerror(errno));
+ g_fprintf(stderr, "error [spawn %s: dup2 out: %s]", prog, strerror(errno));
+ exit(1);
/*NOTREACHED*/
}
if(dup2(errpipe[1], 2) == -1) {
- error(_("error [spawn %s: dup2 err: %s]"), prog, strerror(errno));
+ g_fprintf(stderr, "error [spawn %s: dup2 err: %s]", prog, strerror(errno));
+ exit(1);
/*NOTREACHED*/
}
safe_fd(-1, 0);
}
+ if (need_root) {
+ become_root();
+ } else {
+ /* if our real userid is zero, the child shouldn't inherit
+ * that, so drop privs permanently */
+ if (getuid() == 0 && !set_root_privs(-1)) {
+ error(_("could not drop root privileges"));
+ }
+ }
+
execve(prog, my_argv, env);
e = strerror(errno);
error(_("error [exec %s: %s]"), prog, e);