[openssh-commits] [openssh] 34/87: upstream: make `RevokedKeys none` inside a `Match` block do what

[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 e7b23fc20f9d8dbbadddae5f6015c622a7af19f6
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 30 03:28:03 2026 +0000

    upstream: make `RevokedKeys none` inside a `Match` block do what
    
    it is supposed to do, rather than try to load a file called `none`, fail and
    refuse all connections
    
    Anthropic ANT-2026-NBFF2HDP
    
    OpenBSD-Commit-ID: 92eeae14cfa82d155135433be2df131e3b5582f8
---
 servconf.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/servconf.c b/servconf.c
index 2ec89ed88..70842a076 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.460 2026/10/30 01:55:19 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.461 2026/10/30 03:28:03 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -4077,9 +4077,22 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
 			v = NULL; \
 		} \
 	} while(0)
+#define CLEAR_ON_NONE_ARRAY(v, nv, none) \
+	do { \
+		if (dst->nv == 1 && \
+		    strcasecmp(dst->v[0], none) == 0) { \
+			free(dst->v[0]); \
+			free(dst->v); \
+			dst->v = NULL; \
+			dst->nv = 0; \
+		} \
+	} while (0)
 	CLEAR_ON_NONE(dst->authorized_principals_file);
 	CLEAR_ON_NONE(dst->trusted_user_ca_keys);
 	CLEAR_ON_NONE(dst->banner);
+	CLEAR_ON_NONE_ARRAY(channel_timeouts, num_channel_timeouts, "none");
+	CLEAR_ON_NONE_ARRAY(revoked_keys_files, num_revoked_keys_files, "none");
+#undef CLEAR_ON_NONE_ARRAY
 
 	/*
 	 * The only things that should be below this point are string options

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