fix: Pass config to pdbedit (#15)

samba.sh

@@ -7,29 +7,30 @@ set -Eeuo pipefail
 # and updates the password in the Samba database. The function ensures that the group also exists, 
 # creating it if necessary, and modifies the group ID if it differs from the provided value.
 add_user() {
-    local username="$1"
-    local uid="$2"
-    local groupname="$3"
-    local gid="$4"
-    local password="$5"
+    local cfg="$1"
+    local username="$2"
+    local uid="$3"
+    local groupname="$4"
+    local gid="$5"
+    local password="$6"
 
     # Check if the smb group exists, if not, create it
     if ! getent group "$groupname" &>/dev/null; then
-        echo "Group $groupname does not exist, creating group..."
+        [[ "$groupname" != "smb" ]] && echo "Group $groupname does not exist, creating group..."
         groupadd -o -g "$gid" "$groupname" || { echo "Failed to create group $groupname"; return 1; }
     else
         # Check if the gid right,if not, change it
         local current_gid
         current_gid=$(getent group "$groupname" | cut -d: -f3)
         if [[ "$current_gid" != "$gid" ]]; then
-            echo "Group $groupname exists but GID differs, updating GID..."
+            [[ "$groupname" != "smb" ]] && echo "Group $groupname exists but GID differs, updating GID..."
             groupmod -o -g "$gid" "$groupname" || { echo "Failed to update GID for group $groupname"; return 1; }
         fi
     fi
 
     # Check if the user already exists, if not, create it
     if ! id "$username" &>/dev/null; then
-        echo "User $username does not exist, creating user..."
+        [[ "$username" != "samba" ]] && echo "User $username does not exist, creating user..."
         adduser -S -D -H -h /tmp -s /sbin/nologin -G "$groupname" -u "$uid" -g "Samba User" "$username" || { echo "Failed to create user $username"; return 1; }
     else
         # Check if the uid right,if not, change it
@@ -45,14 +46,14 @@ add_user() {
     fi
 
     # Check if the user is a samba user
-    if pdbedit -L | grep -q "^$username:"; then
+    if pdbedit -s "$cfg" -L | grep -q "^$username:"; then
         # if the user is a samba user, change its password
         echo -e "$password\n$password" | smbpasswd -s "$username" || { echo "Failed to update Samba password for $username"; return 1; }
-        echo "Password for existing Samba user $username has been updated."
+        [[ "$username" != "samba" ]] && echo "Password for existing Samba user $username has been updated."
     else
         # if the user is not a samba user, create it and set a password
         echo -e "$password\n$password" | smbpasswd -a -s "$username" || { echo "Failed to add Samba user $username"; return 1; }
-        echo "User $username has been added to Samba and password set."
+        [[ "$username" != "samba" ]] && echo "User $username has been added to Samba and password set."
     fi
 }
 
@@ -87,7 +88,7 @@ if [[ -f "$user_config" ]] && [[ -f "$config" ]]; then
         fi
 
         # Call the function with extracted values
-        add_user "$username" "$uid" "$groupname" "$gid" "$password"
+        add_user "$config" "$username" "$uid" "$groupname" "$gid" "$password"
 
     done < "$user_config"
 
@@ -106,12 +107,13 @@ else
         PASS=$(cat "$secret")
     fi
 
-    add_user "$USER" "$UID" "$group" "$GID" "$PASS"
-
     if [ -f "$config" ]; then
+
         # Inform the user we are using a custom configuration file.
         echo "Using provided configuration file: $config."
+
     else
+
         config="/etc/samba/smb.tmp"
         template="/etc/samba/smb.default"
 
@@ -128,12 +130,17 @@ else
             # Adjust settings in smb.conf to set share to read-only
             sed -i "s/^\(\s*\)writable =.*/\1writable = no/" "$config"
             sed -i "s/^\(\s*\)read only =.*/\1read only = yes/" "$config"
-        else
-            # Set permissions for share directory if new (empty), leave untouched if otherwise
-            if [ -z "$(ls -A "$share")" ]; then
-                chmod 0770 "$share" || { echo "Failed to set permissions for directory $share"; exit 1; }
-                chown "$USER:$group" "$share" || { echo "Failed to set ownership for directory $share"; exit 1; }
-            fi
+        fi
+
+    fi
+
+    add_user "$config" "$USER" "$UID" "$group" "$GID" "$PASS"
+
+    if [[ "$RW" != [Ff0]* ]]; then
+        # Set permissions for share directory if new (empty), leave untouched if otherwise
+        if [ -z "$(ls -A "$share")" ]; then
+            chmod 0770 "$share" || { echo "Failed to set permissions for directory $share"; exit 1; }
+            chown "$USER:$group" "$share" || { echo "Failed to set ownership for directory $share"; exit 1; }
         fi
     fi