View | Details | Raw Unified | Return to bug 31256 | Differences between
and this patch

Collapse All | Expand All

(-)univention-mount-homedir (-3 / +3 lines)
 Lines 46-52    Link Here 
46
numeric=`echo "$username" | egrep ^[0-9]+$` || true
46
numeric=`echo "$username" | egrep ^[0-9]+$` || true
47
first_numeric=`echo "$username" | egrep ^[0-9].*$` || true
47
first_numeric=`echo "$username" | egrep ^[0-9].*$` || true
48
48
49
eval "$(univention-config-registry shell ldap/hostdn)"
49
ldap_hostdn="$(univention-config-registry get ldap/hostdn)"
50
50
51
if [ -z "$numeric" ] && [ -z "$first_numeric" ]; then
51
if [ -z "$numeric" ] && [ -z "$first_numeric" ]; then
52
	pw_entry=`getent passwd $username `
52
	pw_entry=`getent passwd $username `
 Lines 107-113    Link Here 
107
# though.
107
# though.
108
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'`
108
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'`
109
if [ -z "$homeattr" ]; then
109
if [ -z "$homeattr" ]; then
110
	eval "$(univention-config-registry shell server/role)"
110
	server_role="$(univention-config-registry get server/role)"
111
111
112
	if [ -z "$server_role" ]; then
112
	if [ -z "$server_role" ]; then
113
		# Thin Client
113
		# Thin Client
 Lines 118-124    Link Here 
118
			exit 0
118
			exit 0
119
		fi
119
		fi
120
		# Otherwise look for servers
120
		# Otherwise look for servers
121
		eval "$(univention-config-registry shell ldap/mydn)"
121
		ldap_mydn="$(univention-config-registry get ldap/mydn)"
122
		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
122
		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
123
			if [ -n "$server" ]; then
123
			if [ -n "$server" ]; then
124
				# mount in heartbeat-situations needs to be done from /ha/home, but normally /home fits
124
				# mount in heartbeat-situations needs to be done from /ha/home, but normally /home fits

Return to bug 31256