RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Use gid_t instead of uid_t for groups

Browse source
This commit is contained in:
Vsevolod Velichko 2014-06-17 02:07:16 +04:00
parent c7e0e5aa5e
commit fcd05aca8d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
chroot/chroot.rs
View file

@ -21,7 +21,7 @@ use libc::funcs::posix88::unistd::{execvp, setuid, setgid};
extern { extern {
fn chroot(path: *libc::c_char) -> libc::c_int; fn chroot(path: *libc::c_char) -> libc::c_int;
fn setgroups(size: libc::c_int, list: *libc::uid_t) -> libc::c_int; fn setgroups(size: libc::c_int, list: *libc::gid_t) -> libc::c_int;
} }
static NAME: &'static str = "chroot"; static NAME: &'static str = "chroot";
@ -145,7 +145,7 @@ fn set_main_group(group: &str) {
fn set_groups(groups: &str) { fn set_groups(groups: &str) {
if !groups.is_empty() { if !groups.is_empty() {
let groupsVec: Vec<libc::uid_t> = FromIterator::from_iter( let groupsVec: Vec<libc::gid_t> = FromIterator::from_iter(
groups.split(',').map( groups.split(',').map(
|x| match get_group(x) { |x| match get_group(x) {
None => { crash!(1, "no such group: {}", x) } None => { crash!(1, "no such group: {}", x) }
@ -154,7 +154,7 @@ fn set_groups(groups: &str) {
); );
let err = unsafe { let err = unsafe {
setgroups(groupsVec.len() as libc::c_int, setgroups(groupsVec.len() as libc::c_int,
groupsVec.as_slice().as_ptr() as *libc::uid_t) groupsVec.as_slice().as_ptr() as *libc::gid_t)
}; };
if err != 0 { if err != 0 {
crash!(1, "cannot set groups: {:s}", strerror(err).as_slice()) crash!(1, "cannot set groups: {:s}", strerror(err).as_slice())

2
common/c_types.rs
View file

@ -124,7 +124,7 @@ pub fn get_pw_from_args(free: &Vec<String>) -> Option<c_passwd> {
pub fn get_group(groupname: &str) -> Option<c_group> { pub fn get_group(groupname: &str) -> Option<c_group> {
let group = if groupname.chars().all(|c| c.is_digit()) { let group = if groupname.chars().all(|c| c.is_digit()) {
unsafe { getgrgid(from_str::<uid_t>(groupname).unwrap()) } unsafe { getgrgid(from_str::<gid_t>(groupname).unwrap()) }
} else { } else {
unsafe { getgrnam(groupname.to_c_str().unwrap() as *c_char) } unsafe { getgrnam(groupname.to_c_str().unwrap() as *c_char) }
}; };