summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-04 00:09:26 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-04 00:09:26 +0000
commitb1bdc5a6adae8f5e4d4a4f67c5aba488b5993d5e (patch)
treed4cfe2a08e8ce5c2a4ca9780d5892a343e2c2c28
parenta79616278e15a61eb899bc5b582094c063214238 (diff)
- deraadt@cvs.openbsd.org 2002/06/28 01:50:37
[monitor_wrap.c] use ssize_t
-rw-r--r--ChangeLog5
-rw-r--r--monitor_wrap.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 99e2bb58b..4b093dae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
21 the difference between two pointers is not an int. Just do the 21 the difference between two pointers is not an int. Just do the
22 safest thing and store the result in a long and then return 0, 22 safest thing and store the result in a long and then return 0,
23 -1, or 1 based on that result. 23 -1, or 1 based on that result.
24 - deraadt@cvs.openbsd.org 2002/06/28 01:50:37
25 [monitor_wrap.c]
26 use ssize_t
24 27
2520020702 2820020702
26 - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & 29 - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@@ -1229,4 +1232,4 @@
1229 - (stevesk) entropy.c: typo in debug message 1232 - (stevesk) entropy.c: typo in debug message
1230 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1233 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1231 1234
1232$Id: ChangeLog,v 1.2320 2002/07/04 00:08:23 mouring Exp $ 1235$Id: ChangeLog,v 1.2321 2002/07/04 00:09:26 mouring Exp $
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 938a67d90..00f6c610e 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor_wrap.c,v 1.12 2002/06/26 15:00:32 deraadt Exp $"); 28RCSID("$OpenBSD: monitor_wrap.c,v 1.13 2002/06/28 01:50:37 deraadt Exp $");
29 29
30#include <openssl/bn.h> 30#include <openssl/bn.h>
31#include <openssl/dh.h> 31#include <openssl/dh.h>
@@ -62,8 +62,8 @@ extern Buffer input, output;
62void 62void
63mm_request_send(int socket, enum monitor_reqtype type, Buffer *m) 63mm_request_send(int socket, enum monitor_reqtype type, Buffer *m)
64{ 64{
65 u_char buf[5];
66 u_int mlen = buffer_len(m); 65 u_int mlen = buffer_len(m);
66 u_char buf[5];
67 67
68 debug3("%s entering: type %d", __func__, type); 68 debug3("%s entering: type %d", __func__, type);
69 69
@@ -79,8 +79,8 @@ void
79mm_request_receive(int socket, Buffer *m) 79mm_request_receive(int socket, Buffer *m)
80{ 80{
81 u_char buf[4]; 81 u_char buf[4];
82 ssize_t res;
83 u_int msg_len; 82 u_int msg_len;
83 ssize_t res;
84 84
85 debug3("%s entering", __func__); 85 debug3("%s entering", __func__);
86 86