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

remove tools::getpwnam_ugid, impl. crate::backup::backup_user()

Browse Source 
And use new nix::unistd::User struct.
This commit is contained in:
Dietmar Maurer
2019-12-19 10:20:13 +01:00
parent 8bf4559b4e
commit f74a03da1f
7 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/auth_helpers.rs
View File

@ -97,7 +97,7 @@ pub fn generate_csrf_key() -> Result<(), Error> {
use nix::sys::stat::Mode;
let (_, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
let backup_user = crate::backup::backup_user()?;
replace_file(
&path,
@ -105,7 +105,7 @@ pub fn generate_csrf_key() -> Result<(), Error> {
CreateOptions::new()
.perm(Mode::from_bits_truncate(0o0640))
.owner(nix::unistd::ROOT)
.group(nix::unistd::Gid::from_raw(backup_gid)),
.group(backup_user.gid),
)?;
Ok(())
@ -131,7 +131,7 @@ pub fn generate_auth_key() -> Result<(), Error> {
let public_pem = rsa.public_key_to_pem()?;
let (_, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
let backup_user = crate::backup::backup_user()?;
replace_file(
&public_path,
@ -139,7 +139,7 @@ pub fn generate_auth_key() -> Result<(), Error> {
CreateOptions::new()
.perm(Mode::from_bits_truncate(0o0640))
.owner(nix::unistd::ROOT)
.group(nix::unistd::Gid::from_raw(backup_gid)),
.group(backup_user.gid),
)?;
Ok(())