[git commit] chpst: move misplaced comment

Denys Vlasenko vda.linux at googlemail.com
Fri Sep 16 09:54:13 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=c74a79f28824b634d621c572c079614a8c227479
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 runit/chpst.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/runit/chpst.c b/runit/chpst.c
index 44c21a2..9b8c99b 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -405,18 +405,17 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
 	if (opt & OPT_e)
 		edir(env_dir);
 
-	if (opt & (OPT_u|OPT_U)) {
+	if (opt & (OPT_u|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_U) {
 		xsetenv("GID", utoa(ugid.gid));
 		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) {
 		xchdir(root);
 		xchroot(".");
-- 
1.7.3.4



More information about the busybox-cvs mailing list