Attachment 9149 Details for Bug 42425 – bug42425-qa.patch

[patch] bug42425-qa.patch

bug42425-qa.patch (text/plain), 1.69 KB, created by Arvid Requate on 2017-08-28 21:25:07 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2017-08-28 21:25:07 CEST

Size: 1.69 KB

patch

obsolete

>Index: univention-join
>===================================================================
>--- univention-join	(Revision 82507)
>+++ univention-join	(Arbeitskopie)
>@@ -420,26 +420,26 @@
> 
> echo -n "Check DC Master: "
> 
>-nslookup_out="$(nslookup "$DCNAME" 2>&1)"
>+nslookup_out=$(nslookup "$DCNAME" 2>&1)
> if [ $? -ne 0 ]; then
>-	nslookup_out="$(echo $nslookup_out | sed -e 's/[\r\n]//g')"
>-	nameservers="$(cat /etc/resolv.conf | sed -ne 's/nameserver //p'| tr -d '\n')"
>+	nslookup_out="${nslookup_out//$'\n'/ }"
>+	nameservers=$(cat /etc/resolv.conf | sed -ne 's/^nameserver\s+/ /p' | tr -d '\n')
> 	failed_message "The UCS master server's name \"$DCNAME\" is unknown to the DNS servers (dns servers: $nameservers, nslookup: $nslookup_out)."
> fi
> 
>-ping_out="$(ping -q -c 3 "$DCNAME" 2>&1)"
>+ping_out=$(ping -q -c 3 "$DCNAME" 2>&1)
> if [ $? -ne 0 ]; then
>-	ping6_out="$(ping6 -q -c 3 "$DCNAME" 2>&1)"
>+	ping6_out=$(ping6 -q -c 3 "$DCNAME" 2>&1)
> 	if [ $? -ne 0 ]; then
>-		ping_out="$(echo $ping_out | sed -e 's/[\r\n]//g')"
>-		ping6_out="$(echo $ping6_out | sed -e 's/[\r\n]//g')"
>+		ping_out="${ping_out//$'\n'/ }"
>+		ping6_out="${ping6_out//$'\n'/ }"
> 		failed_message "The UCS master server \"$DCNAME\" is not reachable, ping failed (ping ipv4: $ping_out, ping ipv6: $ping6_out)."
> 	fi
> fi 
> 
>-ssh_out="$(univention-ssh "$DCPWD" "${DCACCOUNT}@${DCNAME}" ls 2>&1)"
>+ssh_out=$(univention-ssh "$DCPWD" "${DCACCOUNT}@${DCNAME}" true 2>&1)
> if [ $? -ne 0 ]; then
>-	ssh_out="$(echo $ssh_out | sed -e 's/[\r\n]//g')"
>+	ssh_out="${ssh_out//$'\n'/ }"
> 	failed_message "The ssh-login to ${DCACCOUNT}@${DCNAME} failed with \"${ssh_out}\". Please make sure the account ${DCACCOUNT} exists and is a member of the Domain Admins group!"
> fi
>

Actions: View | Diff

Attachments on bug 42425: 9149