upstream: when mentioning that the host key has changed, don't

report the type because it is ambiguous as to whether it referred to the
known or new host key. bz3216; ok dtucker@

OpenBSD-Commit-ID: 2d5ce4a83dbcf44e340a572e361decad8aab7bad

diff --git a/sshconnect.c b/sshconnect.c
index 1abe710c1f76a79d1a58a0b99c91edeba2325118..dfee55a85b6326d496b940e5a5bc2af962380909 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.343 2020/11/20 02:14:16 dtucker Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.344 2020/11/22 22:37:11 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1182,8 +1182,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                 */
                if (options.strict_host_key_checking !=
                    SSH_STRICT_HOSTKEY_OFF) {
-                       error("%s host key for %.200s has changed and you have "
-                           "requested strict checking.", type, host);
+                       error("Host key for %.200s has changed and you have "
+                           "requested strict checking.", host);
                        goto fail;
                }