681efe20d

Denys Vlasenko

2011-03-08

FAILED Duration: 216s

Subject

use user's shell instead of hardwired "/bin/sh" (android needs this)

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

archival/libarchive/data_extract_to_command.c+6 -2

@@ -99,8 +99,12 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle)
	close(p[1]);
	xdup2(p[0], STDIN_FILENO);
	signal(SIGPIPE, SIG_DFL);
-	execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", archive_handle->tar__to_command, NULL);
-	bb_perror_msg_and_die("can't execute '%s'", DEFAULT_SHELL);
+	execl(archive_handle->tar__to_command_shell,
+	archive_handle->tar__to_command_shell,
+	"-c",
+	archive_handle->tar__to_command,
+	NULL);
+	bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
	}
	close(p[0]);
	/* Our caller is expected to do signal(SIGPIPE, SIG_IGN)

archival/tar.c+1 -0

@@ -970,6 +970,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
	putenv((char*)"TAR_FILETYPE=f");
	signal(SIGPIPE, SIG_IGN);
	tar_handle->action_data = data_extract_to_command;
+	IF_FEATURE_TAR_TO_COMMAND(tar_handle->tar__to_command_shell = xstrdup(get_shell_name());)
	}

	if (opt & OPT_KEEP_OLD)

console-tools/openvt.c+1 -3

@@ -144,9 +144,7 @@ int openvt_main(int argc UNUSED_PARAM, char **argv)

	if (!argv[0]) {
	argv--;
-	argv[0] = getenv("SHELL");
-	if (!argv[0])
-	argv[0] = (char *) DEFAULT_SHELL;
+	argv[0] = (char *) get_shell_name();
	/argv[1] = NULL; - already is /
	}

coreutils/chroot.c+3 -5

@@ -23,11 +23,9 @@ int chroot_main(int argc UNUSED_PARAM, char **argv)
	++argv;
	if (!argv) { / no 2nd param (PROG), use shell */
	argv -= 2;
-	argv[0] = getenv("SHELL");
-	if (!argv[0]) {
-	argv[0] = (char *) DEFAULT_SHELL;
-	}
-	argv[1] = (char *) "-i";
+	argv[0] = (char *) get_shell_name();
+	argv[1] = (char ) "-i"; / GNU coreutils 8.4 compat */
+	/argv[2] = NULL; - already is /
	}

	BB_EXECVP_or_die(argv);

include/archive.h+1 -0

@@ -84,6 +84,7 @@ typedef struct archive_handle_t {
	# endif
	#if ENABLE_FEATURE_TAR_TO_COMMAND
	char* tar__to_command;
+	const char* tar__to_command_shell;
	#endif
	# if ENABLE_FEATURE_TAR_SELINUX
	char* tar__global_sctx;

include/libbb.h+8 -1

@@ -1198,10 +1198,17 @@ char bb_simplify_path(const char path) FAST_FUNC;
	/* Returns ptr to NUL */
	char bb_simplify_abs_path_inplace(char path) FAST_FUNC;

-	#define FAIL_DELAY 3
+	#define LOGIN_FAIL_DELAY 3
	extern void bb_do_delay(int seconds) FAST_FUNC;
	extern void change_identity(const struct passwd *pw) FAST_FUNC;
	extern void run_shell(const char shell, int loginshell, const char command, const char **additional_args) NORETURN FAST_FUNC;
+
+	/* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL.
+	* Note that getpwuid result might need xstrdup'ing
+	* if there is a possibility of intervening getpwxxx() calls.
+	*/
+	const char *get_shell_name(void);
+
	#if ENABLE_SELINUX
	extern void renew_current_security_context(void) FAST_FUNC;
	extern void set_current_security_context(security_context_t sid) FAST_FUNC;

loginutils/adduser.c+2 -1

@@ -132,7 +132,8 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
	}

	pw.pw_gecos = (char *)"Linux User,,,";
-	pw.pw_shell = (char *)DEFAULT_SHELL;
+	/* We assume that newly created users "inherit" root's shell setting */
+	pw.pw_shell = (char *)get_shell_name();
	pw.pw_dir = NULL;

	/* exactly one non-option arg */

miscutils/conspy.c+1 -3

@@ -316,10 +316,8 @@ static NOINLINE void start_shell_in_child(const char* tty_name)
	int pid = xvfork();
	if (pid == 0) {
	struct termios termchild;
-	char *shell = getenv("SHELL");
+	const char *shell = get_shell_name();

-	if (!shell)
-	shell = (char *) DEFAULT_SHELL;
	signal(SIGHUP, SIG_IGN);
	// set tty as a controlling tty
	setsid();

miscutils/crontab.c+4 -3

@@ -20,8 +20,9 @@
	static void edit_file(const struct passwd pas, const char file)
	{
	const char *ptr;
-	int pid = xvfork();
+	pid_t pid;

+	pid = xvfork();
	if (pid) { /* parent */
	wait4pid(pid);
	return;
@@ -30,7 +31,7 @@ static void edit_file(const struct passwd pas, const char file)
	/* CHILD - change user and run editor */
	/* initgroups, setgid, setuid */
	change_identity(pas);
-	setup_environment(DEFAULT_SHELL,
+	setup_environment(pas->pw_shell,
	SETUP_ENV_CHANGEENV \| SETUP_ENV_TO_TMP,
	pas);
	ptr = getenv("VISUAL");
@@ -41,7 +42,7 @@ static void edit_file(const struct passwd pas, const char file)
	}

	BB_EXECLP(ptr, ptr, file, NULL);
-	bb_perror_msg_and_die("exec %s", ptr);
+	bb_perror_msg_and_die("can't execute '%s'", ptr);
	}

	static int open_as_user(const struct passwd pas, const char file)

networking/ifupdown.c+5 -4

@@ -106,6 +106,7 @@ enum {
	struct globals {
	char **my_environ;
	const char *startup_PATH;
+	char *shell;
	} FIX_ALIASING;
	#define G ((struct globals)&bb_common_bufsiz1)
	#define INIT_G() do { } while (0)
@@ -986,11 +987,10 @@ static int doit(char *str)

	fflush_all();
	child = vfork();
-	switch (child) {
-	case -1: /* failure */
+	if (child < 0) /* failure */
	return 0;
-	case 0: /* child */
-	execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, (char *) NULL, G.my_environ);
+	if (child == 0) { /* child */
+	execle(G.shell, G.shell, "-c", str, (char *) NULL, G.my_environ);
	_exit(127);
	}
	safe_waitpid(child, &status, 0);
@@ -1165,6 +1165,7 @@ int ifupdown_main(int argc UNUSED_PARAM, char **argv)
	INIT_G();

	G.startup_PATH = getenv("PATH");
+	G.shell = xstrdup(get_shell_name());

	cmds = iface_down;
	if (applet_name[2] == 'u') {

runit/svlogd.c+5 -2

@@ -187,6 +187,7 @@ struct globals {
	unsigned nearest_rotate;

	void* (memRchr)(const void , int, size_t);
+	char *shell;

	smallint exitasap;
	smallint rotateasap;
@@ -382,6 +383,9 @@ static void processorstart(struct logdir *ld)
	/* vfork'ed child trashes this byte, save... */
	sv_ch = ld->fnsave[26];

+	if (!G.shell)
+	G.shell = xstrdup(get_shell_name());
+
	while ((pid = vfork()) == -1)
	pause2cannot("vfork for processor", ld->name);
	if (!pid) {
@@ -416,8 +420,7 @@ static void processorstart(struct logdir *ld)
	fd = xopen("newstate", O_WRONLY\|O_NDELAY\|O_TRUNC\|O_CREAT);
	xmove_fd(fd, 5);

-	// getenv("SHELL")?
-	execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", ld->processor, (char*) NULL);
+	execl(G.shell, G.shell, "-c", ld->processor, (char*) NULL);
	bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name);
	}
	ld->fnsave[26] = sv_ch; /* ...restore */

util-linux/script.c+1 -4

@@ -65,10 +65,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
	if (!(opt & OPT_q)) {
	printf("Script started, file is %s\n", fname);
	}
-	shell = getenv("SHELL");
-	if (shell == NULL) {
-	shell = DEFAULT_SHELL;
-	}
+	shell = get_shell_name();

	pty = xgetpty(pty_line);