summaryrefslogtreecommitdiffstats
path: root/core/modules/pam
diff options
context:
space:
mode:
authorSimon Rettberg2017-03-17 20:41:40 +0100
committerSimon Rettberg2017-03-17 20:41:40 +0100
commit74cdfd55f46702c3ad91fd2113b841b17cb613a1 (patch)
treed3ed400f7949f984e1efe6d052cdf5510e12ab96 /core/modules/pam
parent[run-virt] Check SLX_ variables for empty, not isset (diff)
downloadmltk-74cdfd55f46702c3ad91fd2113b841b17cb613a1.tar.gz
mltk-74cdfd55f46702c3ad91fd2113b841b17cb613a1.tar.xz
mltk-74cdfd55f46702c3ad91fd2113b841b17cb613a1.zip
[pam] auth-script: chown tmp-home before trying to mount persistent home
Fixes #3077
Diffstat (limited to 'core/modules/pam')
-rwxr-xr-xcore/modules/pam/data/opt/openslx/scripts/pam_script_auth5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/modules/pam/data/opt/openslx/scripts/pam_script_auth b/core/modules/pam/data/opt/openslx/scripts/pam_script_auth
index 0fe73cbd..e977185e 100755
--- a/core/modules/pam/data/opt/openslx/scripts/pam_script_auth
+++ b/core/modules/pam/data/opt/openslx/scripts/pam_script_auth
@@ -43,6 +43,9 @@ if ! mount | grep -q -F " ${TEMP_HOME_DIR} "; then
slxlog "pam-global-tmpfstemphome" "Could not make a tmpfs on ${TEMP_HOME_DIR}"
exit 1
fi
+ if ! chown "${USER_UID}:${USER_GID}" "${TEMP_HOME_DIR}"; then
+ slxlog "pam-global-chpersistent" "Could not chown '${TEMP_HOME_DIR}' to '${PAM_USER}'."
+ fi
fi
###############################################################################
@@ -63,8 +66,6 @@ if [ -e "${PERSISTENT_MOUNT_SCRIPT}" ] && ! mount | grep -q -F " ${PERSISTENT_HO
# create the PERSISTENT directory and give to user
if ! mkdir -p "${PERSISTENT_HOME_DIR}"; then
slxlog "pam-global-mkpersistent" "Could not create '${PERSISTENT_HOME_DIR}'."
- elif ! chown "${USER_UID}:${USER_GID}" "${TEMP_HOME_DIR}"; then
- slxlog "pam-global-chpersistent" "Could not chown '${TEMP_HOME_DIR}' to '${PAM_USER}'."
else
# everything seems ok, call mount script
. "${PERSISTENT_MOUNT_SCRIPT}" \