[openssh-commits] [openssh] branch master updated: upstream: use different strategy to check whether keys are present or

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Jun 15 16:37:37 AEST 2026


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new f433c0993 upstream: use different strategy to check whether keys are present or
f433c0993 is described below

commit f433c09931665b1139dc9ef0951d3540242e4a38
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Jun 15 06:36:52 2026 +0000

    upstream: use different strategy to check whether keys are present or
    
    absent in the agent; helps some -portable tests on platforms that have stupid
    grep(1)
    
    OpenBSD-Regress-ID: 0cee7ecc437eee7471dc6ccc3b3a0c2b60c1ad2d
---
 regress/agent.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/regress/agent.sh b/regress/agent.sh
index 61a280640..bdd08c6bb 100644
--- a/regress/agent.sh
+++ b/regress/agent.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: agent.sh,v 1.25 2026/06/15 06:24:20 djm Exp $
+#	$OpenBSD: agent.sh,v 1.26 2026/06/15 06:36:52 djm Exp $
 #	Placed in the Public Domain.
 
 tid="simple agent test"
@@ -215,13 +215,13 @@ if [ $r -ne 0 ]; then
 fi
 
 check_key_absent() {
-	${SSHADD} -L | grep "^$1 " >/dev/null
+	${SSHADD} -L | sed s/' .*//' | grep "^$1\$" #>/dev/null
 	if [ $? -eq 0 ]; then
 		fail "$1 key unexpectedly present"
 	fi
 }
 check_key_present() {
-	${SSHADD} -L | grep "^$1 " >/dev/null
+	${SSHADD} -L | sed s/' .*//' | grep "^$1\$" >/dev/null
 	if [ $? -ne 0 ]; then
 		fail "$1 key missing from agent"
 	fi

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list