View | Details | Raw Unified | Return to bug 42376
Collapse All | Expand All

(-)a/management/univention-join/univention-join (-1 / +3 lines)
 Lines 317-324   if [ "$server_role" = "domaincontroller_master" ]; then Link Here 
317
fi
317
fi
318
318
319
if [ -z "$DCACCOUNT" ]; then
319
if [ -z "$DCACCOUNT" ]; then
320
	echo -n "Enter DC Master Account : "
320
	local administrator=$(custom_username "Administrator")
321
	echo -n "Enter DC Master Account [${administrator}]: "
321
	read DCACCOUNT
322
	read DCACCOUNT
323
	DCACCOUNT=${DCACCOUNT:$administrator}
322
fi
324
fi
323
if [ ! -f "$DCPWD" ]; then
325
if [ ! -f "$DCPWD" ]; then
324
	echo -n "Enter DC Master Password: "
326
	echo -n "Enter DC Master Password: "
(-)a/management/univention-join/univention-run-join-scripts (-1 / +3 lines)
 Lines 136-143   fi Link Here 
136
136
137
if [ ! "$server_role" = "domaincontroller_master" ] || [ -n "$ASK_PASS" ] ; then
137
if [ ! "$server_role" = "domaincontroller_master" ] || [ -n "$ASK_PASS" ] ; then
138
	if [ -z "$DCACCOUNT" ]; then
138
	if [ -z "$DCACCOUNT" ]; then
139
		echo -n "Enter DC Master Account : "
139
		local administrator=$(custom_username "Administrator")
140
		echo -n "Enter DC Master Account [${administrator}]: "
140
		read DCACCOUNT
141
		read DCACCOUNT
142
		DCACCOUNT=${DCACCOUNT:$administrator}
141
	fi
143
	fi
142
	if [ -z "$DCPWD" ]; then
144
	if [ -z "$DCPWD" ]; then
143
		echo -n "Enter DC Master Password: "
145
		echo -n "Enter DC Master Password: "

Return to bug 42376