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

(-)management/univention-join/univention-join (-7 / +19 lines)
 Lines 564-576    Link Here 
564
564
565
echo -n "Join Computer Account: "
565
echo -n "Join Computer Account: "
566
args+=(-role "$server_role" -hostname "$hostname" -domainname "$domainname")
566
args+=(-role "$server_role" -hostname "$hostname" -domainname "$domainname")
567
# Copy local $DCPWD to remote $DCPWD' and invoke univention-join remotely
567
for TRY in $(seq 3);
568
univention-ssh --no-split "$DCPWD" "${DCACCOUNT}@${DCNAME}" \
568
	do
569
	'DCPWD=$(mktemp) && trap "rm -f \"$DCPWD\"" EXIT && cat >"$DCPWD" && /usr/share/univention-join/univention-server-join -bindpwfile "$DCPWD"' \
569
	# Copy local $DCPWD to remote $DCPWD' and invoke univention-join remotely
570
	"$(bashquote "${args[@]}")" <"$DCPWD" 2>&1 |
570
	univention-ssh --no-split "$DCPWD" "${DCACCOUNT}@${DCNAME}" \
571
	tee "$USERTMP/secret" |
571
		'DCPWD=$(mktemp) && trap "rm -f \"$DCPWD\"" EXIT && cat >"$DCPWD" && /usr/share/univention-join/univention-server-join -bindpwfile "$DCPWD"' \
572
	grep -v '^KerberosPasswd="' |
572
		"$(bashquote "${args[@]}")" <"$DCPWD" 2>&1 |
573
	tee "$USERTMP/scrubbed" >>/var/log/univention/join.log
573
		tee "$USERTMP/secret" |
574
		grep -v '^KerberosPasswd="' |
575
		tee "$USERTMP/scrubbed" >>/var/log/univention/join.log
576
	if [ -s "$USERTMP/secret" ]
577
	then
578
		kpwd="$(sed -ne 's|^KerberosPasswd="\(.*\)" *|\1|p' <"$USERTMP/secret")"
579
		if [ -n "$kpwd" ]; then
580
			break
581
		fi
582
	fi
583
	echo -n "."
584
	sleep 20
585
done
574
586
575
res_message="$(sed -ne 's/^E:\s*//p' "$USERTMP/scrubbed")"
587
res_message="$(sed -ne 's/^E:\s*//p' "$USERTMP/scrubbed")"
576
if [ -z "$res_message" ]; then
588
if [ -z "$res_message" ]; then

Return to bug 40259