File 9903-Add-A-option-to-various-items-that-allow-e... of Package openssh

Overview Repositories Revisions Requests Users Attributes Meta

File 9903-Add-A-option-to-various-items-that-allow-expansions-.patch of Package openssh (Revision 16789f34b824d51fd18b9a23fe59251b)

Currently displaying revision 16789f34b824d51fd18b9a23fe59251b , Show latest

From e7522f22571145b1118a99e8cd004a03ec6f4f5b Mon Sep 17 00:00:00 2001
From: Ciprian Dorin Craciun <ciprian@volution.ro>
Date: Fri, 3 May 2019 00:13:14 +0300
Subject: [PATCH] Add `%A` option to various (items that allow expansions) and
 which expands to the `HostKeyAlias` (or `HostName`) as configured

---
 ssh.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ssh.c b/ssh.c
index 0777c31e..e21197f5 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1300,20 +1300,21 @@ main(int ac, char **av)
 		    "C", conn_hash_hex,
 		    "L", shorthost,
 		    "d", pw->pw_dir,
 		    "h", host,
 		    "i", uidstr,
 		    "l", thishost,
 		    "n", host_arg,
 		    "p", portstr,
 		    "r", options.user,
 		    "u", pw->pw_name,
+		    "A", (options.host_key_alias ? options.host_key_alias : host),
 		    (char *)NULL);
 		debug3("expanded RemoteCommand: %s", options.remote_command);
 		free(cp);
 		if ((r = sshbuf_put(command, options.remote_command,
 		    strlen(options.remote_command))) != 0)
 			fatal("%s: buffer error: %s", __func__, ssh_err(r));
 	}
 
 	if (options.control_path != NULL) {
 		cp = tilde_expand_filename(options.control_path, getuid());
@@ -1322,20 +1323,21 @@ main(int ac, char **av)
 		    "C", conn_hash_hex,
 		    "L", shorthost,
 		    "h", host,
 		    "i", uidstr,
 		    "l", thishost,
 		    "n", host_arg,
 		    "p", portstr,
 		    "r", options.user,
 		    "u", pw->pw_name,
 		    "i", uidstr,
+		    "A", (options.host_key_alias ? options.host_key_alias : host),
 		    (char *)NULL);
 		free(cp);
 	}
 
 	if (config_test) {
 		dump_client_config(&options, host);
 		exit(0);
 	}
 
 	if (muxclient_command != 0 && options.control_path == NULL)
@@ -1445,20 +1447,21 @@ main(int ac, char **av)
 		} else {
 			p = tilde_expand_filename(options.identity_agent,
 			    getuid());
 			cp = percent_expand(p,
 			    "d", pw->pw_dir,
 			    "h", host,
 			    "i", uidstr,
 			    "l", thishost,
 			    "r", options.user,
 			    "u", pw->pw_name,
+			    "A", (options.host_key_alias ? options.host_key_alias : host),
 			    (char *)NULL);
 			free(p);
 			/*
 			 * If identity_agent represents an environment variable
 			 * then recheck that it is valid (since processing with
 			 * percent_expand() may have changed it) and substitute
 			 * its value.
 			 */
 			if (cp[0] == '$') {
 				if (!valid_env_name(cp + 1)) {
@@ -1875,20 +1878,21 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
 		    "L", shorthost,
 		    "d", pw->pw_dir,
 		    "h", host,
 		    "i", uidstr,
 		    "l", thishost,
 		    "n", host_arg,
 		    "p", portstr,
 		    "r", options.user,
 		    "u", pw->pw_name,
 		    "T", tun_fwd_ifname == NULL ? "NONE" : tun_fwd_ifname,
+		    "A", (options.host_key_alias ? options.host_key_alias : host),
 		    (char *)NULL);
 		debug3("expanded LocalCommand: %s", options.local_command);
 		free(cp);
 	}
 
 	/* Start listening for multiplex clients */
 	if (!packet_get_mux())
 		muxserver_listen(ssh);
 
 	/*
@@ -2026,21 +2030,23 @@ load_public_identity_files(struct passwd *pw)
 	for (i = 0; i < options.num_identity_files; i++) {
 		if (n_ids >= SSH_MAX_IDENTITY_FILES ||
 		    strcasecmp(options.identity_files[i], "none") == 0) {
 			free(options.identity_files[i]);
 			options.identity_files[i] = NULL;
 			continue;
 		}
 		cp = tilde_expand_filename(options.identity_files[i], getuid());
 		filename = percent_expand(cp, "d", pw->pw_dir,
 		    "u", pw->pw_name, "l", thishost, "h", host,
-		    "r", options.user, (char *)NULL);
+		    "r", options.user,
+		    "A", (options.host_key_alias ? options.host_key_alias : host),
+		    (char *)NULL);
 		free(cp);
 		check_load(sshkey_load_public(filename, &public, NULL),
 		    filename, "pubkey");
 		debug("identity file %s type %d", filename,
 		    public ? public->type : -1);
 		free(options.identity_files[i]);
 		identity_files[n_ids] = filename;
 		identity_keys[n_ids] = public;
 		identity_file_userprovided[n_ids] =
 		    options.identity_file_userprovided[i];
@@ -2082,20 +2088,21 @@ load_public_identity_files(struct passwd *pw)
 	for (i = 0; i < options.num_certificate_files; i++) {
 		cp = tilde_expand_filename(options.certificate_files[i],
 		    getuid());
 		filename = percent_expand(cp,
 		    "d", pw->pw_dir,
 		    "h", host,
 		    "i", uidstr,
 		    "l", thishost,
 		    "r", options.user,
 		    "u", pw->pw_name,
+		    "A", (options.host_key_alias ? options.host_key_alias : host),
 		    (char *)NULL);
 		free(cp);
 
 		check_load(sshkey_load_public(filename, &public, NULL),
 		    filename, "certificate");
 		debug("certificate file %s type %d", filename,
 		    public ? public->type : -1);
 		free(options.certificate_files[i]);
 		options.certificate_files[i] = NULL;
 		if (public == NULL) {
-- 
2.21.0

Places

File 9903-Add-A-option-to-various-items-that-allow-expansions-.patch of Package openssh (Revision 16789f34b824d51fd18b9a23fe59251b)

Places