diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 00:15:22 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 00:15:22 +0000 |
commit | fd2aacedabade08a5a3af613a6aca2c299776dd8 (patch) | |
tree | 5919055d7516239fa87626f7198c95bf9e472fa0 | |
parent | a962c2fb35b909a361b3ce0f9eaa670b72e15ece (diff) |
- deraadt@cvs.openbsd.org 2002/07/01 16:15:25
[msg.c]
%u
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | msg.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -38,6 +38,9 @@ | |||
38 | monitor_wrap.c monitor_wrap.h scard.h session.h sftp-glob.c ssh.c | 38 | monitor_wrap.c monitor_wrap.h scard.h session.h sftp-glob.c ssh.c |
39 | sshconnect2.c sshd.c] | 39 | sshconnect2.c sshd.c] |
40 | minor KNF | 40 | minor KNF |
41 | - deraadt@cvs.openbsd.org 2002/07/01 16:15:25 | ||
42 | [msg.c] | ||
43 | %u | ||
41 | 44 | ||
42 | 20020702 | 45 | 20020702 |
43 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & | 46 | - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & |
@@ -1246,4 +1249,4 @@ | |||
1246 | - (stevesk) entropy.c: typo in debug message | 1249 | - (stevesk) entropy.c: typo in debug message |
1247 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1250 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1248 | 1251 | ||
1249 | $Id: ChangeLog,v 1.2325 2002/07/04 00:14:17 mouring Exp $ | 1252 | $Id: ChangeLog,v 1.2326 2002/07/04 00:15:22 mouring Exp $ |
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: msg.c,v 1.3 2002/06/24 15:49:22 itojun Exp $"); | 25 | RCSID("$OpenBSD: msg.c,v 1.4 2002/07/01 16:15:25 deraadt Exp $"); |
26 | 26 | ||
27 | #include "buffer.h" | 27 | #include "buffer.h" |
28 | #include "getput.h" | 28 | #include "getput.h" |
@@ -63,7 +63,7 @@ msg_recv(int fd, Buffer *m) | |||
63 | } | 63 | } |
64 | msg_len = GET_32BIT(buf); | 64 | msg_len = GET_32BIT(buf); |
65 | if (msg_len > 256 * 1024) | 65 | if (msg_len > 256 * 1024) |
66 | fatal("msg_recv: read: bad msg_len %d", msg_len); | 66 | fatal("msg_recv: read: bad msg_len %u", msg_len); |
67 | buffer_clear(m); | 67 | buffer_clear(m); |
68 | buffer_append_space(m, msg_len); | 68 | buffer_append_space(m, msg_len); |
69 | res = atomicio(read, fd, buffer_ptr(m), msg_len); | 69 | res = atomicio(read, fd, buffer_ptr(m), msg_len); |