diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-29 19:25:45 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-29 19:25:45 +0000 |
| commit | 15ca51e3e2a31efc275b616106244d8ec3f8f773 (patch) | |
| tree | e54716fcb612a54cfa72564d9ef089eebe92acbd /libbb/appletlib.c | |
| parent | 5a28a25b9dd81e0975532458723c4244ff532e58 (diff) | |
| download | busybox-15ca51e3e2a31efc275b616106244d8ec3f8f773.tar.gz | |
appletlib.c: make it actally follow _BB_SUID_ALWAYS rules
adduser: implement -S and code shrink / fix uid selection
*: sanitize getspnam_r use
text data bss dec hex filename
777042 974 9676 787692 c04ec busybox_old
776883 974 9676 787533 c044d busybox_unstripped
Diffstat (limited to 'libbb/appletlib.c')
| -rw-r--r-- | libbb/appletlib.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 8b1ed8000..4bd60d049 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -459,10 +459,7 @@ static void check_suid(const struct bb_applet *applet) if (sct->m_applet == applet) goto found; } - /* default: drop all privileges */ - xsetgid(rgid); - xsetuid(ruid); - return; + goto check_need_suid; found: m = sct->m_mode; if (sct->m_uid == ruid) @@ -505,13 +502,13 @@ static void check_suid(const struct bb_applet *applet) } } #endif + check_need_suid: #endif - if (applet->need_suid == _BB_SUID_ALWAYS) { /* Real uid is not 0. If euid isn't 0 too, suid bit * is most probably not set on our executable */ if (geteuid()) - bb_error_msg_and_die("applet requires root privileges!"); + bb_error_msg_and_die("must be suid to work properly"); } else if (applet->need_suid == _BB_SUID_NEVER) { xsetgid(rgid); /* drop all privileges */ xsetuid(ruid); |