From 645995634a1cc8596073c2ce3775335fde9ccbc5 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 20 Dec 2019 09:23:58 +0100
Subject: [PATCH] src/api2/config/datastore.rs - create: pass uid and gid
 instead of User

---
 src/api2/config/datastore.rs |  2 +-
 src/backup/chunk_store.rs    | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index 751c237b..046a03cf 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -60,7 +60,7 @@ fn create_datastore(
 
     let path: PathBuf = param["path"].as_str().unwrap().into();
     let backup_user = crate::backup::backup_user()?;
-    let _store = ChunkStore::create(name, path, backup_user)?;
+    let _store = ChunkStore::create(name, path, backup_user.uid, backup_user.gid)?;
 
     let datastore = json!({
         "path": param["path"],
diff --git a/src/backup/chunk_store.rs b/src/backup/chunk_store.rs
index 020de35a..0f29b659 100644
--- a/src/backup/chunk_store.rs
+++ b/src/backup/chunk_store.rs
@@ -85,7 +85,7 @@ impl ChunkStore {
         chunk_dir
     }
 
-    pub fn create<P>(name: &str, path: P, user: nix::unistd::User) -> Result<Self, Error>
+    pub fn create<P>(name: &str, path: P, uid: nix::unistd::Uid, gid: nix::unistd::Gid) -> Result<Self, Error>
     where
         P: Into<PathBuf>,
     {
@@ -99,8 +99,8 @@ impl ChunkStore {
         let chunk_dir = Self::chunk_dir(&base);
 
         let options = CreateOptions::new()
-            .owner(user.uid)
-            .group(user.gid);
+            .owner(uid)
+            .group(gid);
 
         let default_options = CreateOptions::new();
 
@@ -465,7 +465,8 @@ fn test_chunk_store1() {
     let chunk_store = ChunkStore::open("test", &path);
     assert!(chunk_store.is_err());
 
-    let chunk_store = ChunkStore::create("test", &path, CreateOptions::new()).unwrap();
+    let user = nix::unistd::User::from_uid(nix::unistd::Uid::current()).unwrap().unwrap();
+    let chunk_store = ChunkStore::create("test", &path, user.uid, user.gid).unwrap();
 
     let (chunk, digest) = super::DataChunkBuilder::new(&[0u8, 1u8]).build().unwrap();
 
@@ -476,7 +477,7 @@ fn test_chunk_store1() {
     assert!(exists);
 
 
-    let chunk_store = ChunkStore::create("test", &path, CreateOptions::new());
+    let chunk_store = ChunkStore::create("test", &path, user.uid, user.gid);
     assert!(chunk_store.is_err());
 
     if let Err(_e) = std::fs::remove_dir_all(".testdir") { /* ignore */ }