summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-27 00:12:57 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-27 00:12:57 +0000
commitd5502180cddd0c53e27b7d423156d5ebd11f6f25 (patch)
tree31f81f96ff083d1666fb1fe46eecc19454985bab
parenta8959ae2b79ba64abe40949c299569ec0a8b6faa (diff)
- 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 @@
1200206027
2 - OpenBSD CVS Sync
3 - deraadt@cvs.openbsd.org 2002/06/26 14:49:36
4 [monitor.c]
5 correct %u
6
120020626 720020626
2 - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM 8 - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM
3 - (bal) OpenBSD CVS Sync 9 - (bal) OpenBSD CVS Sync
@@ -1169,4 +1175,4 @@
1169 - (stevesk) entropy.c: typo in debug message 1175 - (stevesk) entropy.c: typo in debug message
1170 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1176 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1171 1177
1172$Id: ChangeLog,v 1.2302 2002/06/26 18:05:32 tim Exp $ 1178$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 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.18 2002/06/26 13:20:57 deraadt Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.19 2002/06/26 14:49:36 deraadt Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -455,7 +455,7 @@ mm_answer_sign(int socket, Buffer *m)
455 p = buffer_get_string(m, &datlen); 455 p = buffer_get_string(m, &datlen);
456 456
457 if (datlen != 20) 457 if (datlen != 20)
458 fatal("%s: data length incorrect: %d", __func__, datlen); 458 fatal("%s: data length incorrect: %u", __func__, datlen);
459 459
460 /* save session id, it will be passed on the first call */ 460 /* save session id, it will be passed on the first call */
461 if (session_id2_len == 0) { 461 if (session_id2_len == 0) {
@@ -469,7 +469,7 @@ mm_answer_sign(int socket, Buffer *m)
469 if (key_sign(key, &signature, &siglen, p, datlen) < 0) 469 if (key_sign(key, &signature, &siglen, p, datlen) < 0)
470 fatal("%s: key_sign failed", __func__); 470 fatal("%s: key_sign failed", __func__);
471 471
472 debug3("%s: signature %p(%d)", __func__, signature, siglen); 472 debug3("%s: signature %p(%u)", __func__, signature, siglen);
473 473
474 buffer_clear(m); 474 buffer_clear(m);
475 buffer_put_string(m, signature, siglen); 475 buffer_put_string(m, signature, siglen);