2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 789e7af47..6cfd29423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
      [ssh.c]
      bz#1746 - suppress spurious tty warning when using -O and stdin
      is not a tty; ok dtucker@ markus@
+   - djm@cvs.openbsd.org 2010/04/10 00:04:30
+     [sshconnect.c]
+     fix terminology: we didn't find a certificate in known_hosts, we found
+     a CA key
 
 20100410
  - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
diff --git a/sshconnect.c b/sshconnect.c
index 9de52224d..effe6dae8 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.220 2010/03/04 10:36:03 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.221 2010/04/10 00:04:30 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -739,7 +739,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                 debug("Host '%.200s' is known and matches the %s host %s.",
                     host, type, want_cert ? "certificate" : "key");
                 debug("Found %s in %s:%d",
-                    want_cert ? "certificate" : "key", host_file, host_line);
+                    want_cert ? "CA key" : "key", host_file, host_line);
                 if (want_cert && !check_host_cert(hostname, host_key))
                         goto fail;
                 if (options.check_host_ip && ip_status == HOST_NEW) {