Index: univention-mount-homedir
===================================================================
--- univention-mount-homedir	(Revision 40219)
+++ univention-mount-homedir	(Arbeitskopie)
@@ -46,7 +46,7 @@
 numeric=`echo "$username" | egrep ^[0-9]+$` || true
 first_numeric=`echo "$username" | egrep ^[0-9].*$` || true
 
-eval "$(univention-config-registry shell ldap/hostdn)"
+ldap_hostdn="$(univention-config-registry get ldap/hostdn)"
 
 if [ -z "$numeric" ] && [ -z "$first_numeric" ]; then
 	pw_entry=`getent passwd $username `
@@ -107,7 +107,7 @@
 # though.
 homeattr=`ldapsearch -x -ZZ -D "$ldap_hostdn" -y /etc/machine.secret -z 1 "(&(objectClass=posixAccount)(objectClass=automount)(uid=$USER))" automountInformation -LLL | /usr/bin/ldapsearch-wrapper | sed -n 's/automountInformation: \(.*\)/\1/p'`
 if [ -z "$homeattr" ]; then
-	eval "$(univention-config-registry shell server/role)"
+	server_role="$(univention-config-registry get server/role)"
 
 	if [ -z "$server_role" ]; then
 		# Thin Client
@@ -118,7 +118,7 @@
 			exit 0
 		fi
 		# Otherwise look for servers
-		eval "$(univention-config-registry shell ldap/mydn)"
+		ldap_mydn="$(univention-config-registry get ldap/mydn)"
 		for server in `univention_policy_result -D "$ldap_hostdn" -y /etc/machine.secret -s "$ldap_mydn" | grep "univentionFileServer" | sed -e 's|.*univentionFileServer=||' | sed -e 's|"||g'`; do
 			if [ -n "$server" ]; then
 				# mount in heartbeat-situations needs to be done from /ha/home, but normally /home fits