[openssh-commits] [openssh] 01/02: upstream: when mentioning that the host key has changed, don't

[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 9b9465ea856e15b9e9890b4ecb4110d7106e7766
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Sun Nov 22 22:37:11 2020 +0000

    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
---
 sshconnect.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sshconnect.c b/sshconnect.c
index 1abe710c..dfee55a8 100644
--- 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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;
 		}
 

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