From 945bf9c81e17271d299808c07ae021f66cbce3e6 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:35:52 +0200
Subject: [PATCH] Update 00-smb_mounts.sh

---
 .templates/00-smb_mounts.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.templates/00-smb_mounts.sh b/.templates/00-smb_mounts.sh
index 747ea0371..290aa0d16 100755
--- a/.templates/00-smb_mounts.sh
+++ b/.templates/00-smb_mounts.sh
@@ -109,12 +109,12 @@ if bashio::config.has_value 'networkdisks'; then
 
             # Are credentials correct
             echo "... testing credentials"
-            OUTPUT="$(smbclient -t 2 -L "$disk" -U "$USERNAME"%"$PASSWORD" "$DOMAINCLIENT" -c "exit" 2>&1"
+            OUTPUT="$(smbclient -t 2 -L "$disk" -U "$USERNAME"%"$PASSWORD" "$DOMAINCLIENT" -c "exit" 2>&1)"
             if echo "$OUTPUT" | grep -q "LOGON_FAILURE"; then
                 bashio::log.fatal "Incorrect Username, Password, or Domain! Script will stop."
                 touch ERRORCODE
                 continue
-            elif echo "$OUTPUT" | grep -q "tree connect failed"; then
+            elif echo "$OUTPUT" | grep -q "tree connect failed" || echo "$OUTPUT" | grep -q "NT_STATUS_CONNECTION_DISCONNECTED"; then
                 echo "... testing path"
                 bashio::log.fatal "Invalid or inaccessible SMB path. Script will stop."
                 touch ERRORCODE
@@ -123,7 +123,7 @@ if bashio::config.has_value 'networkdisks'; then
 
             # Should there be a workgroup
             echo "... testing workgroup"
-            if ! smbclient -t 2 -L $disk -N "$DOMAINCLIENT" &>/dev/null; then
+            if ! smbclient -t 2 -L $disk -N "$DOMAINCLIENT" -c "exit" &>/dev/null; then
                 bashio::log.fatal "A workgroup must perhaps be specified"
                 touch ERRORCODE
                 continue
@@ -184,7 +184,7 @@ if bashio::config.has_value 'networkdisks'; then
             bashio::log.fatal "Here is some debugging info :"
 
             # Provide debugging info
-            smbclient -t 2 -L $disk -U "$USERNAME%$PASSWORD"
+            smbclient -t 2 -L $disk -U "$USERNAME%$PASSWORD" -c "exit"
 
             # Error code
             mount -t cifs -o "rw,file_mode=0775,dir_mode=0775,username=$USERNAME,password=${PASSWORD},nobrl$DOMAIN" "$disk" /mnt/"$diskname" 2> ERRORCODE || MOUNTED=false