Attachment 2921 Details for Bug 2654 – Use correct ssh-add in agent-getpeereid test

[patch] Use correct ssh-add in agent-getpeereid test

0001-Use-correct-ssh-add-in-agent-getpeereid-test.patch (text/plain), 1021 bytes, created by Colin Watson on 2016-12-28 01:29:02 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Watson

Created: 2016-12-28 01:29:02 AEDT

Size: 1021 bytes

patch

obsolete

>From b6a147a8c10a795545d131ef436b2192d5fe2814 Mon Sep 17 00:00:00 2001
>From: Colin Watson <cjwatson@debian.org>
>Date: Tue, 27 Dec 2016 14:26:59 +0000
>Subject: [PATCH] Use correct ssh-add in agent-getpeereid test
>
>---
> regress/agent-getpeereid.sh | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
>index 91621a5..5d0bc90 100644
>--- a/regress/agent-getpeereid.sh
>+++ b/regress/agent-getpeereid.sh
>@@ -32,17 +32,17 @@ if [ $r -ne 0 ]; then
> else
> 	chmod 644 ${SSH_AUTH_SOCK}
> 
>-	ssh-add -l > /dev/null 2>&1
>+	${SSHADD} -l > /dev/null 2>&1
> 	r=$?
> 	if [ $r -ne 1 ]; then
> 		fail "ssh-add failed with $r != 1"
> 	fi
> 	if test -z "$sudo" ; then
> 		# doas
>-		${SUDO} -n -u ${UNPRIV} ssh-add -l 2>/dev/null
>+		${SUDO} -n -u ${UNPRIV} ${SSHADD} -l 2>/dev/null
> 	else
> 		# sudo
>-		< /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l 2>/dev/null
>+		< /dev/null ${SUDO} -S -u ${UNPRIV} ${SSHADD} -l 2>/dev/null
> 	fi
> 	r=$?
> 	if [ $r -lt 2 ]; then
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 2654: 2921