[openssh-commits] [openssh] 04/04: upstream: simpler

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit a30bafcbbd44dc4dc91916240c32ecabff899338
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Wed Sep 16 04:56:12 2026 +0000

    upstream: simpler
    
    OpenBSD-Regress-ID: c7f30b865abd0b3e0e5514f861509c32e352a760
---
 regress/unittests/authopt/tests.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/regress/unittests/authopt/tests.c b/regress/unittests/authopt/tests.c
index bc6b2ea9c..18265edcf 100644
--- a/regress/unittests/authopt/tests.c
+++ b/regress/unittests/authopt/tests.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: tests.c,v 1.6 2026/09/16 04:51:28 djm Exp $ */
+/* 	$OpenBSD: tests.c,v 1.7 2026/09/16 04:56:12 djm Exp $ */
 
 /*
  * Regress test for keys options functions.
@@ -422,9 +422,10 @@ test_merge(void)
 	    rflag, var, val) \
 	do { \
 		PREPARE(keybase " " label, keyname, keywords); \
-		expected = rflag ? default_authkey_restrict_opts() : \
-		    (mostly_off ? sshauthopt_new() : default_authkey_opts()); \
+		expected = mostly_off ? \
+		    sshauthopt_new() : default_authkey_opts(); \
 		ASSERT_PTR_NE(expected, NULL); \
+		expected->restricted = rflag; \
 		expected->var = val; \
 		CHECK_SUCCESS_AND_CLEANUP(); \
 		TEST_DONE(); \

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