summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2014-10-07 17:20:56 +0200
committerJonathan Bauer2014-10-07 17:20:56 +0200
commitc815e6eb0b4c75878a695c93d76c7ec4bee5bd71 (patch)
tree2264b188c57eeaa31ff08408ded9164d3a80d051
parent[pam-share] added file/dir perms to mount opts (diff)
downloadtm-scripts-c815e6eb0b4c75878a695c93d76c7ec4bee5bd71.tar.gz
tm-scripts-c815e6eb0b4c75878a695c93d76c7ec4bee5bd71.tar.xz
tm-scripts-c815e6eb0b4c75878a695c93d76c7ec4bee5bd71.zip
[pam-share] fix mount options
-rw-r--r--remote/modules/pam-common-share/data/opt/openslx/scripts/pam_script_mount_common_share6
1 files changed, 3 insertions, 3 deletions
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;