Merge pull request #252 from zenhack/enter-grain-toolchain-bitrot

Fix some bitrot in enter_grain

helpers/enter-grain-source/src/main.rs

@@ -1,8 +1,6 @@
-#![feature(alloc_system)]
-extern crate alloc_system;
-
 // use std::env;
-use std::fs::File;
+use std::fs::{File, metadata};
+use std::os::unix::fs::MetadataExt;
 use std::io::Read;
 use std::ptr;
 use std::env;
@@ -74,13 +72,12 @@ fn wait_all_children() {
     }
 }
 
-fn setuid_setgid_1000() {
-    // These are the right UID & GID because they are what Sandstorm
-    // uses inside the user namespace.
-    let one_thousand = 1000usize;
+fn setuid_setgid() {
+    let meta = metadata("/var").unwrap();
+
     unsafe {
-        syscall!(SETUID, one_thousand);
-        syscall!(SETGID, one_thousand);
+        syscall!(SETUID, meta.uid());
+        syscall!(SETGID, meta.gid());
     }
 }
 
@@ -173,7 +170,7 @@ fn main() {
     let fork_result = fork();
     if fork_result == 0 {
         // in the child
-        setuid_setgid_1000();
+        setuid_setgid();
         execve_bash(result);
     } else {
         // in the parent

helpers/enter_grain.sha1

@@ -1 +1 @@
-11198904136a7e8079d41ef50af613d21786b5b8  enter_grain
+3e1a80bd7ca1f61de6b3044e904947264e6f6e53  enter_grain