[openssh-commits] [openssh] 07/14: upstream: Propagate authorized_keys "resrict" keyword

[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 991f1f31dde2797416acaf4319dbebe764446c6f
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Wed Sep 16 00:33:44 2026 +0000

    upstream: Propagate authorized_keys "resrict" keyword
    
    The "restrict" keyword was not pervasively being applied to TunnelForwarding
    connections (which are administratively disabled by default). This is a
    separate problem to the one fixed in openssh-10.5
    
    reported by several people; ok markus, deraadt
    
    OpenBSD-Commit-ID: 8c36c31dc2bdbc0c432d1056496b2f1ce93198d1
---
 auth-options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/auth-options.c b/auth-options.c
index e15f600ab..4bbddd7ba 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.102 2025/09/15 04:38:00 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.103 2026/09/16 00:33:44 djm Exp $ */
 /*
  * Copyright (c) 2018 Damien Miller <djm at mindrot.org>
  *
@@ -604,6 +604,7 @@ sshauthopt_merge(const struct sshauthopt *primary,
 	OPTFLAG_AND(no_require_user_presence);
 	/* Restrictive flags are logical-OR (i.e. must be set in either) */
 	OPTFLAG_OR(require_verify);
+	OPTFLAG_OR(restricted);
 #undef OPTFLAG_AND
 
 	/* Earliest expiry time should win */

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