[openssh-commits] [openssh] 70/87: upstream: `ssh -Z` is intended to be a purely local operation and

[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 e49312d045e08a48c3cfdb13bd5f2b02bb6bd6a3
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 30 08:19:30 2026 +0000

    upstream: `ssh -Z` is intended to be a purely local operation and
    
    shouldn't connect to a mux socket.
    
    Anthopic ANT-2026-R47M7VEU
    
    OpenBSD-Commit-ID: 20f2039b371efd0c1e4ea1e16192ec079382a687
---
 ssh.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssh.c b/ssh.c
index ec3ce1208..cf4937782 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.645 2026/10/30 08:17:19 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.646 2026/10/30 08:19:30 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1640,7 +1640,8 @@ main(int ac, char **av)
 
 	if (muxclient_command != 0 && options.control_path == NULL)
 		fatal("No ControlPath specified for \"-O\" command");
-	if (options.control_path != NULL) {
+	/* NB. -Z only lists keys; it must not start a session via a master */
+	if (options.control_path != NULL && !dump_pubkeys) {
 		int sock;
 		if ((sock = muxclient(options.control_path)) >= 0) {
 			if (ssh_packet_set_connection(ssh, sock, sock) == NULL)

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