[openssh-commits] [openssh] 02/04: upstream: Avoid "if ! thing || ! otherthing; then" constructs since

[git+noreply at mindrot.org]

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

dtucker pushed a commit to branch master
in repository openssh.

commit f62868e03e51785c521c4d20d60662c0bbdd695e
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Sun Dec 7 02:59:53 2025 +0000

    upstream: Avoid "if ! thing || ! otherthing; then" constructs since
    
    they seem to cause portability problems.
    
    OpenBSD-Regress-ID: ff001be683de43bf396cd5f9f6a54e0c7a99c3cf
---
 regress/multiplex.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index f68af935e..584bbbe22 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.40 2025/12/06 03:23:27 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.41 2025/12/07 02:59:53 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="connection multiplexing"
@@ -214,14 +214,18 @@ start_mux_master
 verbose "test $tid: cmd conninfo algos"
 conninfo=`${SSH} -F $OBJ/ssh_config -S $CTL -Oconninfo otherhost` \
      || fail "request remote forward failed"
-if ! echo "$conninfo" | grep "kexalgorithm curve25519-sha256" >/dev/null ||
-    ! echo "$conninfo" | grep "cipher aes128-ctr" >/dev/null; then
+if echo "$conninfo" | grep "kexalgorithm curve25519-sha256" >/dev/null &&
+    echo "$conninfo" | grep "cipher aes128-ctr" >/dev/null; then
+	trace "ok conninfo algos"
+else
 	fail "conninfo algos"
 fi
 if [ "$compression" = "yes" ]; then
 	verbose "test $tid: cmd conninfo compression"
-	if ! echo "$conninfo" | grep "compression zlib" >/dev/null ||
-	    ! echo "$conninfo" | grep "compressed" >/dev/null; then
+	if echo "$conninfo" | grep "compression zlib" >/dev/null &&
+	    echo "$conninfo" | grep "compressed" >/dev/null; then
+		trace "ok conninfo compression"
+	else
 		fail "conninfo compression"
 	fi
 fi

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