From 077bbe211a42f2ca1cf511f387dd61c34529dbb3 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 4 Feb 2014 16:51:08 +0100
Subject: [pam-fr] dont delete WIP file while its beeing sent

---
 .../pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'server/modules')

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 8b75b810..9f48d98d 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
@@ -39,8 +39,9 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then
 	fi
 
 	SIGNAL=$(mktemp)
+	MOUNT_OUTPUT=$(mktemp)
 	rm -f -- "${SIGNAL}"
-	( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "/tmp/home.$PAM_USER" 2>&1 || touch "${SIGNAL}" ) &
+	( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "$MOUNT_OUTPUT" 2>&1 || touch "${SIGNAL}" ) &
 	MOUNT_PID=$!
 	for COUNTER in 1 2 4 4; do
 		kill -0 "${MOUNT_PID}" 2>/dev/null || break
@@ -48,14 +49,14 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then
 	done
 
 	if [ -e "${SIGNAL}" ]; then
-		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER"
+		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "$MOUNT_OUTPUT"
 		rm -f -- "${SIGNAL}"
 	elif kill -9 "${MOUNT_PID}" 2>/dev/null; then
-		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER"
+		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "$MOUNT_OUTPUT"
 	else
 		PERSISTENT_OK=yes
 	fi
-	rm -f -- "/tmp/home.$PAM_USER"
+	( sleep 2; rm -f -- "$MOUNT_OUTPUT" ) &
 
 fi
 
-- 
cgit v1.2.3-55-g7522