diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
commit | aae6c614da614eb10ced16505f35410671c95d9d (patch) | |
tree | 441e578781d38e7de4c5f609a4f86695d937e640 /hostfile.c | |
parent | dc33fc3910552c82518503b581efc1a51192fa76 (diff) |
- 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
Diffstat (limited to 'hostfile.c')
-rw-r--r-- | hostfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hostfile.c b/hostfile.c index cdfb48f3e..7060a899e 100644 --- a/hostfile.c +++ b/hostfile.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: hostfile.c,v 1.6 1999/11/25 00:54:59 damien Exp $"); | 17 | RCSID("$OpenBSD: hostfile.c,v 1.10 1999/12/02 20:18:59 markus Exp $"); |
18 | 18 | ||
19 | #include "packet.h" | 19 | #include "packet.h" |
20 | #include "ssh.h" | 20 | #include "ssh.h" |
@@ -231,9 +231,9 @@ check_host_in_hostfile(const char *filename, const char *host, | |||
231 | continue; | 231 | continue; |
232 | 232 | ||
233 | if (kbits != BN_num_bits(kn)) { | 233 | if (kbits != BN_num_bits(kn)) { |
234 | error("Warning: error in %s, line %d: keysize mismatch for host %s: " | 234 | error("Warning: %s, line %d: keysize mismatch for host %s: " |
235 | "actual size %d vs. announced %d.", | 235 | "actual %d vs. announced %d.", |
236 | filename, linenum, host, BN_num_bits(kn), kbits); | 236 | filename, linenum, host, BN_num_bits(kn), kbits); |
237 | error("Warning: replace %d with %d in %s, line %d.", | 237 | error("Warning: replace %d with %d in %s, line %d.", |
238 | kbits, BN_num_bits(kn), filename, linenum); | 238 | kbits, BN_num_bits(kn), filename, linenum); |
239 | } | 239 | } |