From 9221a238a8bcf61bc08bfb1057a8e0587e1a60a1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Jun 2018 12:51:44 +0200
Subject: [pam-slx-plug] Fix minor logging issues

---
 core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/modules/pam-slx-plug')

diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback b/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback
index 144b78ba..c1e966f6 100644
--- a/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback
+++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback
@@ -57,8 +57,9 @@ for opt in $OPTION_LIST; do
 		[ -n "$EXTRA_OPTS" ] && OPTS="${OPTS},${EXTRA_OPTS}"
 		[ "x$dom" != "x#" ] && OPTS="${OPTS},domain=$dom"
 		[ "x$opt" != "x#" ] && OPTS="${OPTS},$opt"
+		OPTS=${OPTS:1}
 		echo " ****** Trying '$OPTS'" > "$FILE"
-		[ -n "$OPTS" ] && COMMAND_LINE="$COMMAND_LINE -o ${OPTS:1}"
+		[ -n "$OPTS" ] && COMMAND_LINE="$COMMAND_LINE -o ${OPTS}"
 		mount ${COMMAND_LINE} "${NETWORK_HOME}" "${PERSISTENT_HOME_DIR}" >> "${FILE}" 2>&1 &
 		PID=$!
 		# Wait max. 1 second; remember PID if this mount call seems to be running after we stop waiting
@@ -90,7 +91,7 @@ fi
 if ! isHomeMounted; then
 	LOG_COMBINED=$(mktemp)
 	[ -n "$LOGFILES" ] && cat ${LOGFILES} > "$LOG_COMBINED" # No quotes
-	slxlog --delete "pam-ad-mount" "Mount of '${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed." "${LOG_COMBINED}"
+	slxlog --delete "pam-ad-mount" "Mount of '${NETWORK_HOME}' to '${PERSISTENT_HOME_DIR}' failed." "${LOG_COMBINED}"
 fi
 
 [ -n "${LOGFILES}" ] && rm -f -- ${LOGFILES} # No quotes
-- 
cgit v1.2.3-55-g7522