emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chpst: simple code shrink

Browse Source 
function                                             old     new   delta
chpst_main                                           733     718     -15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-09-16 11:52:43 +02:00
parent 585541e8e3
commit d18ef6c9f6
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runit/chpst.c
View File

@ -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(".");