diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2022-01-12 23:19:11 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2022-01-12 23:19:11 +0100 |
| commit | d162a7b978a98b910e410dc10a40d5de12db0419 (patch) | |
| tree | 63271dbbe027b26692befba9944d0554b00968d0 /include | |
| parent | 004cefa918483513a9eca13e7701c74dff160e95 (diff) | |
| download | busybox-w32-d162a7b978a98b910e410dc10a40d5de12db0419.tar.gz busybox-w32-d162a7b978a98b910e410dc10a40d5de12db0419.tar.bz2 busybox-w32-d162a7b978a98b910e410dc10a40d5de12db0419.zip | |
sulogin: increase util-linux compatibility
Change to root's HOME. Set some envvars. Steal ctty if necessary and possible.
function old new delta
sulogin_main 240 340 +100
setup_environment 225 233 +8
su_main 479 474 -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 108/-5) Total: 103 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/libbb.h b/include/libbb.h index daa310776..a0ffbef62 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -1726,15 +1726,16 @@ extern void selinux_or_die(void) FAST_FUNC; | |||
| 1726 | 1726 | ||
| 1727 | 1727 | ||
| 1728 | /* setup_environment: | 1728 | /* setup_environment: |
| 1729 | * if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die | 1729 | * if !SETUP_ENV_NO_CHDIR: |
| 1730 | * if clear_env = 1: cd(pw->pw_dir), clear environment, then set | 1730 | * if cd(pw->pw_dir): ok: else if SETUP_ENV_TO_TMP: cd(/tmp) else: cd(/) or die |
| 1731 | * if SETUP_ENV_CLEARENV: cd(pw->pw_dir), clear environment, then set | ||
| 1731 | * TERM=(old value) | 1732 | * TERM=(old value) |
| 1732 | * USER=pw->pw_name, LOGNAME=pw->pw_name | 1733 | * USER=pw->pw_name, LOGNAME=pw->pw_name |
| 1733 | * PATH=bb_default_[root_]path | 1734 | * PATH=bb_default_[root_]path |
| 1734 | * HOME=pw->pw_dir | 1735 | * HOME=pw->pw_dir |
| 1735 | * SHELL=shell | 1736 | * SHELL=shell |
| 1736 | * else if change_env = 1: | 1737 | * else if SETUP_ENV_CHANGEENV: |
| 1737 | * if not root (if pw->pw_uid != 0): | 1738 | * if not root (if pw->pw_uid != 0) or if SETUP_ENV_CHANGEENV_LOGNAME: |
| 1738 | * USER=pw->pw_name, LOGNAME=pw->pw_name | 1739 | * USER=pw->pw_name, LOGNAME=pw->pw_name |
| 1739 | * HOME=pw->pw_dir | 1740 | * HOME=pw->pw_dir |
| 1740 | * SHELL=shell | 1741 | * SHELL=shell |
| @@ -1743,10 +1744,11 @@ extern void selinux_or_die(void) FAST_FUNC; | |||
| 1743 | * NB: CHANGEENV and CLEARENV use setenv() - this leaks memory! | 1744 | * NB: CHANGEENV and CLEARENV use setenv() - this leaks memory! |
| 1744 | * If setup_environment() is used is vforked child, this leaks memory _in parent too_! | 1745 | * If setup_environment() is used is vforked child, this leaks memory _in parent too_! |
| 1745 | */ | 1746 | */ |
| 1746 | #define SETUP_ENV_CHANGEENV (1 << 0) | 1747 | #define SETUP_ENV_CHANGEENV (1 << 0) |
| 1747 | #define SETUP_ENV_CLEARENV (1 << 1) | 1748 | #define SETUP_ENV_CHANGEENV_LOGNAME (1 << 1) |
| 1748 | #define SETUP_ENV_TO_TMP (1 << 2) | 1749 | #define SETUP_ENV_CLEARENV (1 << 2) |
| 1749 | #define SETUP_ENV_NO_CHDIR (1 << 4) | 1750 | #define SETUP_ENV_TO_TMP (1 << 3) |
| 1751 | #define SETUP_ENV_NO_CHDIR (1 << 4) | ||
| 1750 | void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; | 1752 | void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; |
| 1751 | void nuke_str(char *str) FAST_FUNC; | 1753 | void nuke_str(char *str) FAST_FUNC; |
| 1752 | #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM | 1754 | #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM |
