diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | hostfile.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -18,6 +18,10 @@ | |||
18 | information about account validity. bz #975, patch originally from | 18 | information about account validity. bz #975, patch originally from |
19 | Senthil Kumar, sanity checked by Simon Wilkinson, tested by djm@, biorn@, | 19 | Senthil Kumar, sanity checked by Simon Wilkinson, tested by djm@, biorn@, |
20 | ok markus@ | 20 | ok markus@ |
21 | - dtucker@cvs.openbsd.org 2005/11/22 03:36:03 | ||
22 | [hostfile.c] | ||
23 | Correct format/arguments to debug call; spotted by shaw at vranix.com | ||
24 | ok djm@ | ||
21 | 25 | ||
22 | 20051120 | 26 | 20051120 |
23 | - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what | 27 | - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what |
@@ -3327,4 +3331,4 @@ | |||
3327 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3331 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3328 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3332 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3329 | 3333 | ||
3330 | $Id: ChangeLog,v 1.4000 2005/11/22 08:42:42 dtucker Exp $ | 3334 | $Id: ChangeLog,v 1.4001 2005/11/22 08:43:26 dtucker Exp $ |
diff --git a/hostfile.c b/hostfile.c index 63550a29d..3ed646247 100644 --- a/hostfile.c +++ b/hostfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: hostfile.c,v 1.35 2005/07/27 10:39:03 dtucker Exp $"); | 39 | RCSID("$OpenBSD: hostfile.c,v 1.36 2005/11/22 03:36:03 dtucker Exp $"); |
40 | 40 | ||
41 | #include <resolv.h> | 41 | #include <resolv.h> |
42 | #include <openssl/hmac.h> | 42 | #include <openssl/hmac.h> |
@@ -88,8 +88,8 @@ extract_salt(const char *s, u_int l, char *salt, size_t salt_len) | |||
88 | return (-1); | 88 | return (-1); |
89 | } | 89 | } |
90 | if (ret != SHA_DIGEST_LENGTH) { | 90 | if (ret != SHA_DIGEST_LENGTH) { |
91 | debug2("extract_salt: expected salt len %u, got %u", | 91 | debug2("extract_salt: expected salt len %d, got %d", |
92 | salt_len, ret); | 92 | SHA_DIGEST_LENGTH, ret); |
93 | return (-1); | 93 | return (-1); |
94 | } | 94 | } |
95 | 95 | ||