summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJonathan Bauer2014-06-13 18:17:54 +0200
committerJonathan Bauer2014-06-13 18:17:54 +0200
commitea5a52eb2981b8fe531887c3956957742075548a (patch)
treea1ce3ae62bb7e5a624eb90aa6eb91fd8bd01ecd9 /server
parentMerge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff)
downloadtm-scripts-ea5a52eb2981b8fe531887c3956957742075548a.tar.gz
tm-scripts-ea5a52eb2981b8fe531887c3956957742075548a.tar.xz
tm-scripts-ea5a52eb2981b8fe531887c3956957742075548a.zip
[pam-fr] fix locking problems
Diffstat (limited to 'server')
-rw-r--r--server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent6
1 files changed, 2 insertions, 4 deletions
diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
index e2618588..a467b301 100644
--- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
+++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
@@ -16,11 +16,9 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then
CIFS_VOLUME=$(cat /tmp/ldapsearch.${PAM_USER} | grep rufHomepath | cut -d" " -f2 | tr '\\' '/')
- # TODO: fix CIFS mount. Currently breaks certain file operations, e.g. firefox's sqlite files
- if false; then
- #if [ ! -z "${CIFS_VOLUME}" ]; then
+ if [ ! -z "${CIFS_VOLUME}" ]; then
# now we can mount the home directory!
- MOUNT_OPTS="-t cifs -o uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,file_mode=0600,dir_mode=0700"
+ MOUNT_OPTS="-t cifs -o uid=${USER_UID},gid=${USER_GID},forceuid,forcegid,file_mode=0600,dir_mode=0700,nobrl,noacl"
export USER="${PAM_USER}"
export PASSWD="${PAM_AUTHTOK}"