From 318039fd066d349f22e5663b9950eb6779383b8b Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 11 Apr 2018 16:40:57 +0200
Subject: [*] LDAP_DOMAIN_OVERRIDE -> SHARE_DOMAIN

---
 core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback    | 4 ++--
 .../pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config       | 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/mount.d/99-fallback b/core/modules/pam-slx-plug/data/opt/openslx/pam/mount.d/99-fallback
index ea3b4ae9..144b78ba 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
@@ -29,7 +29,7 @@ if [ "$MOUNT" = "cifs" ]; then
 	if [ -n "$LDAP_BASE" ]; then
 		XDOMAIN=$( echo "$LDAP_BASE" | grep -o -E -i 'DC=([^,;]+)' | head -n 1 | cut -c 4- )
 	fi
-	if [ -z "$LDAP_DOMAIN_OVERRIDE" ]; then
+	if [ -z "$SHARE_DOMAIN" ]; then
 		XDOMAIN="$XDOMAIN #"
 	fi
 
@@ -44,7 +44,7 @@ PIDS=
 CNT=0
 for opt in $OPTION_LIST; do
 	# try with and without explicit domain argument
-	for dom in $LDAP_DOMAIN_OVERRIDE $XDOMAIN; do # No quotes
+	for dom in $SHARE_DOMAIN $XDOMAIN; do # No quotes
 		CNT=$(( CNT + 1 ))
 		FILE=$(mktemp)
 		LOGFILES="$LOGFILES $FILE"
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config b/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config
index b8e43331..7de43b7e 100755
--- a/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config
+++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/systemd/create-pam-config
@@ -40,7 +40,7 @@ write_sssd_config() {
 	HERE
 	for file in /opt/openslx/pam/slx-ldap.d/*; do
 		[ -f "$file" ] || continue
-		unset LDAP_ATTR_MOUNT_OPTS LDAP_URI LDAP_BASE LDAP_DOMAIN_OVERRIDE LDAP_CACERT
+		unset LDAP_ATTR_MOUNT_OPTS LDAP_URI LDAP_BASE SHARE_DOMAIN LDAP_CACERT
 		. "$file"
 		[ -z "$LDAP_URI" ] && continue
 		[ -z "$LDAP_BASE" ] && continue
-- 
cgit v1.2.3-55-g7522