From 985417153190a13a94bfbd9c454b1dc61d14aa7a Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 10 Oct 2025 06:24:35 +0200
Subject: [PATCH] Update samba.sh

---
 src/samba.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/samba.sh b/src/samba.sh
index f163dc4..d70cb1a 100644
--- a/src/samba.sh
+++ b/src/samba.sh
@@ -44,6 +44,7 @@ addShare() {
   local name="$3"
   local comment="$4"
   local cfg="$5"
+  local owner=""
 
   mkdir -p "$dir" || return 1
 
@@ -52,9 +53,15 @@ addShare() {
   fi
 
   if [ -z "$(ls -A "$dir")" ]; then
-    if ! chmod 777 "$dir"; then
+    if ! chmod 2777 "$dir"; then
       error "Failed to set permissions for directory $dir" && return 1
     fi
+    owner=$(stat -c %u "$dir")
+    if [[ "$owner" == "0" ]]; then
+      if ! chown "1000:1000" "$dir"; then
+        error "Failed to set ownership for directory $dir" && return 1
+      fi
+    fi
   fi
 
   if [[ "$dir" == "$tmp" ]]; then
@@ -107,11 +114,13 @@ addShare() {
         echo "    follow symlinks = yes"
         echo "    wide links = yes"
         echo "    unix extensions = no"
-        echo "    inherit owner = unix only"
-        echo "    create mask = 0664"
-        echo "    directory mask = 2755"
-        echo "    force create mode = 0644"
-        echo "    force directory mode = 2755"
+        echo "    inherit owner = yes"
+        echo "    create mask = 0666"
+        echo "    directory mask = 02777"
+        echo "    force user = root"
+        echo "    force group = root"
+        echo "    force create mode = 0666"
+        echo "    force directory mode = 02777"
         echo ""
         echo "    # Disable printing services"
         echo "    load printers = no"