summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-11-09 15:43:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-11-09 15:43:23 +0000
commitee844912c94226a09c95e4140c158d9c4f37a0b5 (patch)
tree7644cc4cc35cde94a323eee75a17825c8c8ad62a
parent0cc2a476749e366d54afa842c5cc77d629deed29 (diff)
- markus@cvs.openbsd.org 2002/10/23 10:40:16
[bufaux.c] %u for u_int
-rw-r--r--ChangeLog5
-rw-r--r--bufaux.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7120cceec..9d4a185ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - markus@cvs.openbsd.org 2002/10/23 10:32:13 6 - markus@cvs.openbsd.org 2002/10/23 10:32:13
7 [packet.c] 7 [packet.c]
8 use %u for u_int 8 use %u for u_int
9 - markus@cvs.openbsd.org 2002/10/23 10:40:16
10 [bufaux.c]
11 %u for u_int
9 12
1020021021 1320021021
11 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from 14 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@@ -783,4 +786,4 @@
783 save auth method before monitor_reset_key_state(); bugzilla bug #284; 786 save auth method before monitor_reset_key_state(); bugzilla bug #284;
784 ok provos@ 787 ok provos@
785 788
786$Id: ChangeLog,v 1.2501 2002/11/09 15:41:39 mouring Exp $ 789$Id: ChangeLog,v 1.2502 2002/11/09 15:43:23 mouring Exp $
diff --git a/bufaux.c b/bufaux.c
index d3dc674ce..3c276b810 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -37,7 +37,7 @@
37 */ 37 */
38 38
39#include "includes.h" 39#include "includes.h"
40RCSID("$OpenBSD: bufaux.c,v 1.27 2002/06/26 08:53:12 markus Exp $"); 40RCSID("$OpenBSD: bufaux.c,v 1.28 2002/10/23 10:40:16 markus Exp $");
41 41
42#include <openssl/bn.h> 42#include <openssl/bn.h>
43#include "bufaux.h" 43#include "bufaux.h"
@@ -225,7 +225,7 @@ buffer_get_string(Buffer *buffer, u_int *length_ptr)
225 /* Get the length. */ 225 /* Get the length. */
226 len = buffer_get_int(buffer); 226 len = buffer_get_int(buffer);
227 if (len > 256 * 1024) 227 if (len > 256 * 1024)
228 fatal("buffer_get_string: bad string length %d", len); 228 fatal("buffer_get_string: bad string length %u", len);
229 /* Allocate space for the string. Add one byte for a null character. */ 229 /* Allocate space for the string. Add one byte for a null character. */
230 value = xmalloc(len + 1); 230 value = xmalloc(len + 1);
231 /* Get the string. */ 231 /* Get the string. */