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

chpst: move misplaced comment

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-09-16 11:54:13 +02:00
parent d18ef6c9f6
commit c74a79f288
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runit/chpst.c
View File

@ -405,18 +405,17 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
if (opt & OPT_e) if (opt & OPT_e)
edir(env_dir); edir(env_dir);
if (opt & (OPT_u|OPT_U)) { if (opt & (OPT_u|OPT_U))
xget_uidgid(&ugid, set_user); 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_U) { if (opt & OPT_U) {
xsetenv("GID", utoa(ugid.gid)); xsetenv("GID", utoa(ugid.gid));
xsetenv("UID", utoa(ugid.uid)); xsetenv("UID", utoa(ugid.uid));
} }
// 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) { if (opt & OPT_root) {
xchdir(root); xchdir(root);
xchroot("."); xchroot(".");