Permalink
Browse files

chpst: simple code shrink

function                                             old     new   delta
chpst_main                                           733     718     -15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
  • Loading branch information...
1 parent 585541e commit d18ef6c9f6f5c94f2a65a6ab6ae3776711cb2877 Denys Vlasenko committed Sep 16, 2011
Showing with 7 additions and 8 deletions.
  1. +7 −8 runit/chpst.c
View
15 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(".");

0 comments on commit d18ef6c

Please sign in to comment.