From 9deea6d5b4681fbb0226f5d178cf8897185ec86c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 9 Mar 2018 14:22:03 +0100
Subject: [pam-slx-plug] Add missing homeDirectory to ldapsearch, fix mount.d
 path

---
 .../pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap       | 4 ++--
 core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap b/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap
index fd2d4a3c..7fcf1383 100644
--- a/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap
+++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/auth-source.d/99-slx-ldap
@@ -60,7 +60,7 @@ run_auth() {
 	for retries in 0 1 1 2 3 END; do
 		ldapsearch -x -LLL -l 3 -o nettimeout=3 -o ldif-wrap=no \
 				-H "$LDAP_URI" -b "$LDAP_BASE" uid="${PAM_USER}" \
-				dn distinguishedName homeMount realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_ANON}"
+				dn distinguishedName homeMount homeDirectory realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_ANON}"
 		RET=$?
 		case "$RET" in
 			0) break # OK
@@ -104,7 +104,7 @@ run_auth() {
 		# unquoted LDAP_ATTR_*
 		ldapsearch -x -LLL -l 5 -o nettimeout=5 -o ldif-wrap=no \
 				-H "$LDAP_URI" -b "$LDAP_BASE" uid="${PAM_USER}" -y "${PW}" -D "$BINDDN" uid="${PAM_USER}" \
-				homeMount realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_USER}"
+				homeMount homeDirectory realAccount uid uidNumber gidNumber ${LDAP_ATTR_MOUNT_OPTS} &> "${SEARCH_USER}"
 		RET=$?
 		rm -f -- "${PW}"
 		case "$RET" in
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth
index 9883bdaf..00fa856e 100755
--- a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth
+++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_auth
@@ -148,7 +148,7 @@ if ! isHomeMounted; then
 	if ! mkdir -p "${PERSISTENT_HOME_DIR}"; then
 		slxlog "pam-global-mkpersistent" "Could not create '${PERSISTENT_HOME_DIR}'."
 	else
-		for mount_file in /opt/openslx/pam/mount-persistent.d/*; do
+		for mount_file in /opt/openslx/pam/mount.d/*; do
 			[ -f "$mount_file" ] || continue
 			. "$mount_file"
 			if isHomeMounted; then
-- 
cgit v1.2.3-55-g7522