From e207c43912ba6a36b41455bcbc3cd0469984120d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 6 Feb 2017 14:28:58 +0100
Subject: [run-virt] Fix domain name extraction from ldap config

---
 .../opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx/scripts')

diff --git a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials b/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials
index a03d8886..7d80abe0 100644
--- a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials
+++ b/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials
@@ -22,10 +22,10 @@ if [ -n "$TEMP_HOME_DIR" ]; then
 			XDOMAIN=$(grep -F " ${PERSISTENT_HOME_DIR} " "/proc/mounts" | grep -m1 -F 'domain=' | sed -r 's/^.*[ ,]domain=([^ ,]+)[ ,].*$/\1/g')
 		fi
 		if [ -z "$XDOMAIN" ]; then
-			XDOMAIN=$(grep -m1 -i '^BASE\s*DC=' "/etc/ldap.conf" | sed -r 's/^BASE\s*DC=([^,;]+).*$/\1/I')
+			XDOMAIN=$(<"/etc/ldap.conf" grep -m1 -i '^BASE\s.*DC=' | grep -o -E -i 'DC=([^,;]+)' | head -n 1 | cut -c 4-)
 		fi
 		if [ -z "$XDOMAIN" ]; then
-			XDOMAIN=$(grep -m1 -i '^ldap_search_base\s*=\s*DC=' "/etc/sssd/sssd.conf" | sed -r 's/^ldap_search_base\s*=\s*DC=([^,;]+).*$/\1/I')
+			XDOMAIN=$(<"/etc/sssd/sssd.conf" grep -m1 -i '^ldap_search_base\s*=.*DC=' | grep -o -E -i 'DC=[^,;]+' | head -n 1 | cut -c 4-)
 		fi
 		if [ -n "$XDOMAIN" ]; then
 			XDOMAIN=$(echo "$XDOMAIN" | tr '[a-z]' '[A-Z]')
-- 
cgit v1.2.3-55-g7522