summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-09-16 09:52:43 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-09-16 09:52:43 (GMT)
commitd18ef6c9f6f5c94f2a65a6ab6ae3776711cb2877 (patch)
treef48bc44b44267942bcbbd3ec3d840a04ff9a6e49
parent585541e8e338a85b9f18cf5f6ed88758b29e61f2 (diff)
downloadbusybox-d18ef6c9f6f5c94f2a65a6ab6ae3776711cb2877.tar.gz
busybox-d18ef6c9f6f5c94f2a65a6ab6ae3776711cb2877.tar.bz2
chpst: simple code shrink
function old new delta chpst_main 733 718 -15 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--runit/chpst.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/runit/chpst.c b/runit/chpst.c
index 1857060..44c21a2 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -405,19 +405,18 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
if (opt & OPT_e)
edir(env_dir);
- // FIXME: chrooted jail must have /etc/passwd if we move this after chroot!
- // OTOH chroot fails for non-roots!
- // SOLUTION: cache uid/gid before chroot, apply uid/gid after
+ if (opt & (OPT_u|OPT_U)) {
+ xget_uidgid(&ugid, set_user);
+ }
+
if (opt & OPT_U) {
- xget_uidgid(&ugid, env_user);
xsetenv("GID", utoa(ugid.gid));
xsetenv("UID", utoa(ugid.uid));
}
- if (opt & OPT_u) {
- xget_uidgid(&ugid, set_user);
- }
-
+ // chrooted jail must have /etc/passwd if we move this after chroot.
+ // OTOH chroot fails for non-roots.
+ // Solution: cache uid/gid before chroot, apply uid/gid after.
if (opt & OPT_root) {
xchdir(root);
xchroot(".");