Attachment #161609 for bug #230637

Lines 78-83 Link Here

(-)include/applets.h.orig (+1 lines)
78	USE_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_NEVER))	78	USE_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_NEVER))
79	USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))	79	USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))
80	USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))	80	USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))
		81	USE_ASH(APPLET_ODDNAME(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER, ash))
81	USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))	82	USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
82	//USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))	83	//USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
83	USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))	84	USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))

Lines 6873-6878 Link Here

(-)shell/ash.c.orig (+2 lines)
6873	run_applet_no_and_exit(applet_no, argv);	6873	run_applet_no_and_exit(applet_no, argv);
6874	/* re-exec ourselves with the new arguments */	6874	/* re-exec ourselves with the new arguments */
6875	execve(bb_busybox_exec_path, argv, envp);	6875	execve(bb_busybox_exec_path, argv, envp);
		6876	execve("/bin/busybox.static", argv, envp);
		6877	execve("/bin/busybox", argv, envp);
6876	/* If they called chroot or otherwise made the binary no longer	6878	/* If they called chroot or otherwise made the binary no longer
6877	* executable, fall through */	6879	* executable, fall through */
6878	}	6880	}

Return to bug 230637