summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-27 02:12:57 +0200
committerBen Lindstrom <mouring@eviladmin.org>2002-06-27 02:12:57 +0200
commitd5502180cddd0c53e27b7d423156d5ebd11f6f25 (patch)
tree31f81f96ff083d1666fb1fe46eecc19454985bab
parent[contrib/caldera/openssh.spec] remove 2 configure options I put in by mistake (diff)
downloadopenssh-d5502180cddd0c53e27b7d423156d5ebd11f6f25.tar.xz
openssh-d5502180cddd0c53e27b7d423156d5ebd11f6f25.zip
- deraadt@cvs.openbsd.org 2002/06/26 14:49:36
[monitor.c] correct %u
-rw-r--r--ChangeLog8
-rw-r--r--monitor.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f09ad39f..83a88d48c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+200206027
+ - OpenBSD CVS Sync
+ - deraadt@cvs.openbsd.org 2002/06/26 14:49:36
+ [monitor.c]
+ correct %u
+
20020626
- (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM
- (bal) OpenBSD CVS Sync
@@ -1169,4 +1175,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2302 2002/06/26 18:05:32 tim Exp $
+$Id: ChangeLog,v 1.2303 2002/06/27 00:12:57 mouring Exp $
diff --git a/monitor.c b/monitor.c
index 89b712f2d..86562243d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.18 2002/06/26 13:20:57 deraadt Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.19 2002/06/26 14:49:36 deraadt Exp $");
#include <openssl/dh.h>
@@ -455,7 +455,7 @@ mm_answer_sign(int socket, Buffer *m)
p = buffer_get_string(m, &datlen);
if (datlen != 20)
- fatal("%s: data length incorrect: %d", __func__, datlen);
+ fatal("%s: data length incorrect: %u", __func__, datlen);
/* save session id, it will be passed on the first call */
if (session_id2_len == 0) {
@@ -469,7 +469,7 @@ mm_answer_sign(int socket, Buffer *m)
if (key_sign(key, &signature, &siglen, p, datlen) < 0)
fatal("%s: key_sign failed", __func__);
- debug3("%s: signature %p(%d)", __func__, signature, siglen);
+ debug3("%s: signature %p(%u)", __func__, signature, siglen);
buffer_clear(m);
buffer_put_string(m, signature, siglen);