From e67770d4963475c78fd7521592f8e607251ea586 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 20 Dec 2019 09:11:40 +0100
Subject: [PATCH] src/backup/chunk_store.rs - create: pass User instead of
 CreateOptions

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

diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index 984f48ef..751c237b 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -5,7 +5,6 @@ use serde_json::{json, Value};
 
 use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
 use proxmox::api::schema::*;
-use proxmox::tools::fs::CreateOptions;
 
 use crate::api2::types::*;
 use crate::backup::*;
@@ -61,13 +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,
-        CreateOptions::new()
-            .owner(backup_user.uid)
-            .group(backup_user.gid),
-    )?;
+    let _store = ChunkStore::create(name, path, backup_user)?;
 
     let datastore = json!({
         "path": param["path"],
diff --git a/src/backup/chunk_store.rs b/src/backup/chunk_store.rs
index f8857aca..020de35a 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, options: CreateOptions) -> Result<Self, Error>
+    pub fn create<P>(name: &str, path: P, user: nix::unistd::User) -> Result<Self, Error>
     where
         P: Into<PathBuf>,
     {
@@ -98,6 +98,10 @@ impl ChunkStore {
 
         let chunk_dir = Self::chunk_dir(&base);
 
+        let options = CreateOptions::new()
+            .owner(user.uid)
+            .group(user.gid);
+
         let default_options = CreateOptions::new();
 
         if let Err(err) = create_path(&base, Some(default_options.clone()), Some(options.clone())) {