2 files changed, 7 insertions, 10 deletions

diff --git a/runit/chpst.c b/runit/chpst.c
index 185706089..9b8c99bdd 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -405,19 +405,17 @@ 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);
+
+        // 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) {
-                xget_uidgid(&ugid, env_user);
                 xsetenv("GID", utoa(ugid.gid));
                 xsetenv("UID", utoa(ugid.uid));
         }
 
-        if (opt & OPT_u) {
-                xget_uidgid(&ugid, set_user);
-        }
-
         if (opt & OPT_root) {
                 xchdir(root);
                 xchroot(".");
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 9495a2a4f..32526cf4c 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -75,8 +75,7 @@ struct globals {
 #define logpipe     (G.logpipe     )
 #define pfd         (G.pfd         )
 #define stamplog    (G.stamplog    )
-#define INIT_G() do { \
-} while (0)
+#define INIT_G() do { } while (0)
 
 static void fatal2_cannot(const char *m1, const char *m2)
 {