remove pbs-tools/src/sys.rs

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>

diff --git a/pbs-config/src/lib.rs b/pbs-config/src/lib.rs
index b68b1bde11625969f590b10bf81995f350c6ad2f..118030bcef0c5d5a2add1fd8b5b9c0594619fbbc 100644 (file)
--- a/pbs-config/src/lib.rs
+++ b/pbs-config/src/lib.rs
@@ -20,20 +20,30 @@ mod config_version_cache;
 pub use config_version_cache::ConfigVersionCache;
 
 use anyhow::{format_err, Error};
+use nix::unistd::{Gid, Group, Uid, User};
 
 pub use pbs_buildcfg::{BACKUP_USER_NAME, BACKUP_GROUP_NAME};
 
 /// Return User info for the 'backup' user (``getpwnam_r(3)``)
 pub fn backup_user() -> Result<nix::unistd::User, Error> {
-    pbs_tools::sys::query_user(BACKUP_USER_NAME)?
-        .ok_or_else(|| format_err!("Unable to lookup '{}' user.", BACKUP_USER_NAME))
+    if cfg!(test) {
+        Ok(User::from_uid(Uid::current())?.expect("current user does not exist"))
+    } else {
+        User::from_name(BACKUP_USER_NAME)?
+            .ok_or_else(|| format_err!("Unable to lookup '{}' user.", BACKUP_USER_NAME))
+    }
 }
 
 /// Return Group info for the 'backup' group (``getgrnam(3)``)
 pub fn backup_group() -> Result<nix::unistd::Group, Error> {
-    pbs_tools::sys::query_group(BACKUP_GROUP_NAME)?
-        .ok_or_else(|| format_err!("Unable to lookup '{}' group.", BACKUP_GROUP_NAME))
+    if cfg!(test) {
+        Ok(Group::from_gid(Gid::current())?.expect("current group does not exist"))
+    } else {
+        Group::from_name(BACKUP_GROUP_NAME)?
+            .ok_or_else(|| format_err!("Unable to lookup '{}' group.", BACKUP_GROUP_NAME))
+    }
 }
+
 pub struct BackupLockGuard(Option<std::fs::File>);
 
 #[doc(hidden)]

diff --git a/pbs-tools/src/lib.rs b/pbs-tools/src/lib.rs
index 8c001222b98bbc4088cafd1df5a29ff7ccf6169d..96524ce1563224b62442187694e0a43e3cad5316 100644 (file)
--- a/pbs-tools/src/lib.rs
+++ b/pbs-tools/src/lib.rs
@@ -9,7 +9,6 @@ pub mod percent_encoding;
 pub mod sha;
 pub mod str;
 pub mod sync;
-pub mod sys;
 pub mod ticket;
 
 pub mod async_lru_cache;

diff --git a/pbs-tools/src/sys.rs b/pbs-tools/src/sys.rs
deleted file mode 100644 (file)
index c5dcc74..0000000
--- a/pbs-tools/src/sys.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-//! System level helpers.
-
-use nix::unistd::{Gid, Group, Uid, User};
-
-/// Query a user by name but only unless built with `#[cfg(test)]`.
-///
-/// This is to avoid having regression tests query the users of development machines which may
-/// not be compatible with PBS or privileged enough.
-pub fn query_user(user_name: &str) -> Result<Option<User>, nix::Error> {
-    if cfg!(test) {
-        Ok(Some(
-            User::from_uid(Uid::current())?.expect("current user does not exist"),
-        ))
-    } else {
-        User::from_name(user_name)
-    }
-}
-
-/// Query a group by name but only unless built with `#[cfg(test)]`.
-///
-/// This is to avoid having regression tests query the groups of development machines which may
-/// not be compatible with PBS or privileged enough.
-pub fn query_group(group_name: &str) -> Result<Option<Group>, nix::Error> {
-    if cfg!(test) {
-        Ok(Some(
-            Group::from_gid(Gid::current())?.expect("current group does not exist"),
-        ))
-    } else {
-        Group::from_name(group_name)
-    }
-}

diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs
index 84aacf6579c9f58fa29f62bf90a80f1b41c1cd4f..055e018a3fd9a85f52c1d9fcda6f9b6ffe8a77b9 100644 (file)
--- a/proxmox-file-restore/src/main.rs
+++ b/proxmox-file-restore/src/main.rs
@@ -506,7 +506,7 @@ fn create_run_dir() -> Result<(), Error> {
 
 /// Return User info for the 'backup' user (``getpwnam_r(3)``)
 pub fn backup_user() -> Result<nix::unistd::User, Error> {
-    pbs_tools::sys::query_user(pbs_buildcfg::BACKUP_USER_NAME)?
-        .ok_or_else(|| format_err!("Unable to lookup '{}' user.", pbs_buildcfg::BACKUP_USER_NAME))
+    nix::unistd::User::from_name(pbs_buildcfg::BACKUP_USER_NAME)?
+        .ok_or_else(|| format_err!("Unable to lookup '{}' user.",  pbs_buildcfg::BACKUP_USER_NAME))
 }