From b2cd571147391de779f4eb6a468d7afe41fd1954 Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Mon, 25 Jan 2021 12:16:51 +0100
Subject: [run-virt] Add sec= option to mount-script

refs: #3830
---
 .../data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc         | 3 ++-
 .../data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux')

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc
index 93f0d3db..3cee7944 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc
@@ -28,7 +28,8 @@ if [ ! $(mount 2>/dev/null | grep -q "$DISKMOUNTDIR") ]; then
 fi
 
 # CIFSVERSIONS="3.11 3.0 2.1 2.0 1.0"
-CIFSVERSIONS="3.0 2.1 1.0 3.11 2.0"
+#CIFSVERSIONS="3.0 2.1 1.0 3.11 2.0"
+CIFSVERSIONS="vers=3.0,sec=ntlmssp vers=2.1,sec=ntlmssp vers=1.0,sec=ntlm vers=3.0,sec=ntlmv2 vers=1.0,sec=ntlmv2 vers=3.0,sec=ntlm vers=2.0,sec=ntlmssp"
 MOUNTCIFSPRAE="-v -t cifs -o "
 MOUNTCIFSOPTS="uid=$(id --user "$LOCALUSER"),gid=$(id --group "$LOCALUSER"),forceuid,forcegid,file_mode=0700,dir_mode=0700,nobrl,noacl"
 MOUNTNFSPRAE="-v -t nfs4 -o "
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
index c899108f..33ccf686 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
@@ -49,7 +49,7 @@ function mounter()
 				x=2
 				for VERSION in $CIFSVERSIONS; do
 					AUSGANG=0
-					while ! mount $1 vers="$VERSION",${2} $3 $4 2>/dev/null 1>&2; do
+					while ! mount $1 "$VERSION",${2} $3 $4 2>/dev/null 1>&2; do
 						logger "openslx sharemapper: could not mount ${3} to ${4}, waited another $x seconds, retrying."
 						sleep $x
 						if [ "$x" -gt 4 ]; then
-- 
cgit v1.2.3-55-g7522