summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--msg.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d4be3bb..1c454523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
monitor_wrap.c monitor_wrap.h scard.h session.h sftp-glob.c ssh.c
sshconnect2.c sshd.c]
minor KNF
+ - deraadt@cvs.openbsd.org 2002/07/01 16:15:25
+ [msg.c]
+ %u
20020702
- (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@@ -1246,4 +1249,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2325 2002/07/04 00:14:17 mouring Exp $
+$Id: ChangeLog,v 1.2326 2002/07/04 00:15:22 mouring Exp $
diff --git a/msg.c b/msg.c
index 7275c847..de19b057 100644
--- a/msg.c
+++ b/msg.c
@@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: msg.c,v 1.3 2002/06/24 15:49:22 itojun Exp $");
+RCSID("$OpenBSD: msg.c,v 1.4 2002/07/01 16:15:25 deraadt Exp $");
#include "buffer.h"
#include "getput.h"
@@ -63,7 +63,7 @@ msg_recv(int fd, Buffer *m)
}
msg_len = GET_32BIT(buf);
if (msg_len > 256 * 1024)
- fatal("msg_recv: read: bad msg_len %d", msg_len);
+ fatal("msg_recv: read: bad msg_len %u", msg_len);
buffer_clear(m);
buffer_append_space(m, msg_len);
res = atomicio(read, fd, buffer_ptr(m), msg_len);