From d18ef6c9f6f5c94f2a65a6ab6ae3776711cb2877 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 16 Sep 2011 11:52:43 +0200 Subject: chpst: simple code shrink function old new delta chpst_main 733 718 -15 Signed-off-by: Denys Vlasenko --- runit/chpst.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'runit') diff --git a/runit/chpst.c b/runit/chpst.c index 185706089..44c21a2a4 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("."); -- cgit v1.2.3