summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-22 19:43:26 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-22 19:43:26 +1100
commit593bae7e10e61c41b73c5939e2f045e93ccd605e (patch)
tree5d3239eff49ed2cdc79e2dda433de89c98ec2f43
parentf4732f647572f40d93f4fbd1e65d744ed10b2620 (diff)
downloadopenssh-git-593bae7e10e61c41b73c5939e2f045e93ccd605e.tar.gz
- dtucker@cvs.openbsd.org 2005/11/22 03:36:03
[hostfile.c] Correct format/arguments to debug call; spotted by shaw at vranix.com ok djm@
-rw-r--r--ChangeLog6
-rw-r--r--hostfile.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6077bb5a..1d1529e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
information about account validity. bz #975, patch originally from
Senthil Kumar, sanity checked by Simon Wilkinson, tested by djm@, biorn@,
ok markus@
+ - dtucker@cvs.openbsd.org 2005/11/22 03:36:03
+ [hostfile.c]
+ Correct format/arguments to debug call; spotted by shaw at vranix.com
+ ok djm@
20051120
- (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what
@@ -3327,4 +3331,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4000 2005/11/22 08:42:42 dtucker Exp $
+$Id: ChangeLog,v 1.4001 2005/11/22 08:43:26 dtucker Exp $
diff --git a/hostfile.c b/hostfile.c
index 63550a29..3ed64624 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.35 2005/07/27 10:39:03 dtucker Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.36 2005/11/22 03:36:03 dtucker Exp $");
#include <resolv.h>
#include <openssl/hmac.h>
@@ -88,8 +88,8 @@ extract_salt(const char *s, u_int l, char *salt, size_t salt_len)
return (-1);
}
if (ret != SHA_DIGEST_LENGTH) {
- debug2("extract_salt: expected salt len %u, got %u",
- salt_len, ret);
+ debug2("extract_salt: expected salt len %d, got %d",
+ SHA_DIGEST_LENGTH, ret);
return (-1);
}