diff options
Diffstat (limited to 'src/unshare.rs')
| -rw-r--r-- | src/unshare.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/unshare.rs b/src/unshare.rs index 717bf53..00a6f14 100644 --- a/src/unshare.rs +++ b/src/unshare.rs @@ -7,7 +7,7 @@ use std::{ process, }; -use nix::unistd; +use nix::unistd::{self, Gid, Uid}; // use crate::prepared_command::PreparedCommand; use crate::util::Checkable; @@ -62,8 +62,8 @@ struct SubIDMap { count: ID, } -pub const BUILD_UID: ID = 800; -pub const BUILD_GID: ID = 800; +pub const BUILD_UID: Uid = Uid::from_raw(800); +pub const BUILD_GID: Gid = Gid::from_raw(800); fn generate_idmap(id: ID, mapped_id: ID, mut ranges: Vec<SubIDRange>) -> Vec<SubIDMap> { let mut map = Vec::new(); @@ -104,13 +104,13 @@ fn generate_idmap(id: ID, mapped_id: ID, mut ranges: Vec<SubIDRange>) -> Vec<Sub fn get_uid_map() -> Result<Vec<SubIDMap>> { let uid = users::get_effective_uid(); let uid_ranges = read_id_ranges(Path::new("/etc/subuid"))?; - Ok(generate_idmap(uid, BUILD_UID, uid_ranges)) + Ok(generate_idmap(uid, BUILD_UID.as_raw(), uid_ranges)) } fn get_gid_map() -> Result<Vec<SubIDMap>> { let gid = users::get_effective_gid(); let gid_ranges = read_id_ranges(Path::new("/etc/subgid"))?; - Ok(generate_idmap(gid, BUILD_GID, gid_ranges)) + Ok(generate_idmap(gid, BUILD_GID.as_raw(), gid_ranges)) } fn run_idmap_cmd(cmd: &str, pid: &str, map: &Vec<SubIDMap>) -> Result<()> { |