diff options
| author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
| commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
| tree | f64a4ace625514e94759878c0b94ab0a79805bbd /hostfile.c | |
| parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
| parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) | |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'hostfile.c')
| -rw-r--r-- | hostfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||