From c815e6eb0b4c75878a695c93d76c7ec4bee5bd71 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 7 Oct 2014 17:20:56 +0200
Subject: [pam-share] fix mount options

---
 .../data/opt/openslx/scripts/pam_script_mount_common_share          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote/modules/pam-common-share/data')

diff --git a/remote/modules/pam-common-share/data/opt/openslx/scripts/pam_script_mount_common_share b/remote/modules/pam-common-share/data/opt/openslx/scripts/pam_script_mount_common_share
index 74230a48..5ffb1205 100644
--- a/remote/modules/pam-common-share/data/opt/openslx/scripts/pam_script_mount_common_share
+++ b/remote/modules/pam-common-share/data/opt/openslx/scripts/pam_script_mount_common_share
@@ -35,7 +35,7 @@ mount_common_share() {
 	if [ "${SLX_COMMON_SHARE_PATH:0:2}" = "//" ]; then
 		# '//' prefixed, assume windows share
 		# prepare common mount options for either authentication type
-		MOUNT_OPTS="-t cifs"
+		MOUNT_OPTS="-t cifs -o nounix,uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,nobrl,noacl"
 
 		# flag for failure
 		SIGNAL=$(mktemp)
@@ -44,11 +44,11 @@ mount_common_share() {
 		MOUNT_OUTPUT=$(mktemp)
 		# now see if the share needs credentials
 		if [ "${SLX_COMMON_SHARE_AUTH}" = "guest" ]; then
-			MOUNT_OPTS="${MOUNT_OPTS} -o guest,file_mode=0777,dir_mode=0777"
+			MOUNT_OPTS="${MOUNT_OPTS},guest,file_mode=0777,dir_mode=0777"
 		elif [ "${SLX_COMMON_SHARE_AUTH}" = "user" ]; then
 			export USER="{PAM_USER}"
 			export PASSWD="{PAM_AUTHTOK}"
-			MOUNT_OPTS="${MOUNT_OPTS} -o uid=${USER_GID},gid=${USER_GID},forceuid,forcegid,nobrl,noacl,sec=ntln,file_mode=0700,dir_mode=0700"
+			MOUNT_OPTS="${MOUNT_OPTS},sec=ntlm,file_mode=0700,dir_mode=0700"
 		else
 			slxlog "pam-share-auth" "Auth type '${SLX_COMMON_SHARE_AUTH}' not supported."
 			return;
-- 
cgit v1.2.3-55-g7522