tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix regression test file permission problems

Browse Source 
By simply using the current user/group instead of backup:backup
This commit is contained in:
Dietmar Maurer 2021-07-21 08:12:51 +02:00 committed by Thomas Lamprecht
parent 89145cde34
commit ac81ed17b9
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backup/mod.rs
View File

@ -12,17 +12,27 @@ pub const BACKUP_GROUP_NAME: &str = "backup";
/// Return User info for the 'backup' user (``getpwnam_r(3)``) /// Return User info for the 'backup' user (``getpwnam_r(3)``)
pub fn backup_user() -> Result<nix::unistd::User, Error> { pub fn backup_user() -> Result<nix::unistd::User, Error> {
match nix::unistd::User::from_name(BACKUP_USER_NAME)? { if cfg!(test) {
Some(user) => Ok(user), // fix permission problems with regressions test (when run as non-root).
None => bail!("Unable to lookup backup user."), Ok(nix::unistd::User::from_uid(nix::unistd::Uid::current())?.unwrap())
} else {
match nix::unistd::User::from_name(BACKUP_USER_NAME)? {
Some(user) => Ok(user),
None => bail!("Unable to lookup backup user."),
}
} }
} }
/// Return Group info for the 'backup' group (``getgrnam(3)``) /// Return Group info for the 'backup' group (``getgrnam(3)``)
pub fn backup_group() -> Result<nix::unistd::Group, Error> { pub fn backup_group() -> Result<nix::unistd::Group, Error> {
match nix::unistd::Group::from_name(BACKUP_GROUP_NAME)? { if cfg!(test) {
Some(group) => Ok(group), // fix permission problems with regressions test (when run as non-root).
None => bail!("Unable to lookup backup user."), Ok(nix::unistd::Group::from_gid(nix::unistd::Gid::current())?.unwrap())
} else {
match nix::unistd::Group::from_name(BACKUP_GROUP_NAME)? {
Some(group) => Ok(group),
None => bail!("Unable to lookup backup user."),
}
} }
} }