From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Fri, 30 Aug 2024 11:26:42 +0000 (+0200)
Subject: Fix for mounting fails on SMB provider (#1631)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=41d9b62b9275947db8c8e0975d1291b4f036d82b;p=music-assistant-server.git

Fix for mounting fails on SMB provider (#1631)
---

diff --git a/music_assistant/server/providers/filesystem_smb/__init__.py b/music_assistant/server/providers/filesystem_smb/__init__.py
index 370df89d..d924130f 100644
--- a/music_assistant/server/providers/filesystem_smb/__init__.py
+++ b/music_assistant/server/providers/filesystem_smb/__init__.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import os
 import platform
 from typing import TYPE_CHECKING
 
@@ -187,6 +186,10 @@ class SMBFileSystemProvider(LocalFileSystemProvider):
             if mount_options := str(self.config.get_value(CONF_MOUNT_OPTIONS)):
                 options += mount_options.split(",")
 
+            options += ["username", f'"{username}"']
+            if password:
+                options += ["password", f'"{password}"']
+
             options_str = ",".join(options)
             mount_cmd = [
                 "mount",
@@ -197,7 +200,6 @@ class SMBFileSystemProvider(LocalFileSystemProvider):
                 f"//{server}/{share}{subfolder}",
                 self.base_path,
             ]
-
         else:
             msg = f"SMB provider is not supported on {platform.system()}"
             raise LoginFailed(msg)
@@ -207,14 +209,7 @@ class SMBFileSystemProvider(LocalFileSystemProvider):
             "Using mount command: %s",
             [m.replace(str(password), "########") if password else m for m in mount_cmd],
         )
-        env_vars = {
-            **os.environ,
-            "USER": username,
-        }
-        if password:
-            env_vars["PASSWD"] = str(password)
-
-        returncode, output = await check_output(*mount_cmd, env=env_vars)
+        returncode, output = await check_output(*mount_cmd)
         if returncode != 0:
             msg = f"SMB mount failed with error: {output.decode()}"
             raise LoginFailed(msg)