- Merged OpenBSD CVS changes:

   - [auth-krb4.c auth-passwd.c auth-skey.c ssh.
     move skey-auth from auth-passwd.c to auth-s
   - [auth-rsa.c]
     warn only about mismatch if key is _used_
     warn about keysize-mismatch with log() not
     channels.c readconf.c readconf.h ssh.c ssh.
     ports are u_short
   - [hostfile.c]
     indent, shorter warning
   - [nchan.c]
     use error() for internal errors
   - [packet.c]
     set loglevel for SSH_MSG_DISCONNECT to log(
     serverloop.c
     indent
   - [ssh-add.1 ssh-add.c ssh.h]
     document , reasonable default
   - [ssh.1]
     CheckHostIP is not available for connects v
   - [sshconnect.c]
     typo
     easier to read client code for passwd and s
     turn of checkhostip for proxy connects, sin

1 files changed, 4 insertions, 4 deletions

diff --git a/hostfile.c b/hostfile.c
index cdfb48f3..7060a899 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: hostfile.c,v 1.6 1999/11/25 00:54:59 damien Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.10 1999/12/02 20:18:59 markus Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -231,9 +231,9 @@ check_host_in_hostfile(const char *filename, const char *host,
 			continue;
 
 		if (kbits != BN_num_bits(kn)) {
-			error("Warning: error in %s, line %d: keysize mismatch for host %s: "
-			      "actual size %d vs. announced %d.",
-			filename, linenum, host, BN_num_bits(kn), kbits);
+			error("Warning: %s, line %d: keysize mismatch for host %s: "
+			      "actual %d vs. announced %d.",
+			      filename, linenum, host, BN_num_bits(kn), kbits);
 			error("Warning: replace %d with %d in %s, line %d.",
 			      kbits, BN_num_bits(kn), filename, linenum);
 		}