summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-21 00:41:51 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-21 00:41:51 +0000
commitcb72e4f6d2cf63cda22484ec90142689fed288f6 (patch)
tree3bc1bb95abd19df05ee0b3e78bad6cdba987837f /monitor_wrap.c
parent115422f918d86e007cb3c050e9c4d09102580089 (diff)
- deraadt@cvs.openbsd.org 2002/06/19 00:27:55
[auth-bsdauth.c auth-skey.c auth1.c auth2-chall.c auth2-none.c authfd.c authfd.h monitor_wrap.c msg.c nchan.c radix.c readconf.c scp.c sftp.1 ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh-keysign.c ssh.1 sshconnect.c sshconnect.h sshconnect2.c ttymodes.c xmalloc.h] KNF done automatically while reading....
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 65998a1e1..e40874627 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.9 2002/06/14 21:35:00 todd Exp $"); 28RCSID("$OpenBSD: monitor_wrap.c,v 1.10 2002/06/19 00:27:55 deraadt Exp $");
29 29
30#include <openssl/bn.h> 30#include <openssl/bn.h>
31#include <openssl/dh.h> 31#include <openssl/dh.h>
@@ -68,7 +68,7 @@ mm_request_send(int socket, enum monitor_reqtype type, Buffer *m)
68 debug3("%s entering: type %d", __func__, type); 68 debug3("%s entering: type %d", __func__, type);
69 69
70 PUT_32BIT(buf, mlen + 1); 70 PUT_32BIT(buf, mlen + 1);
71 buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ 71 buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */
72 if (atomicio(write, socket, buf, sizeof(buf)) != sizeof(buf)) 72 if (atomicio(write, socket, buf, sizeof(buf)) != sizeof(buf))
73 fatal("%s: write", __func__); 73 fatal("%s: write", __func__);
74 if (atomicio(write, socket, buffer_ptr(m), mlen) != mlen) 74 if (atomicio(write, socket, buffer_ptr(m), mlen) != mlen)
@@ -221,7 +221,7 @@ char* mm_auth2_read_banner(void)
221 mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTH2_READ_BANNER, &m); 221 mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTH2_READ_BANNER, &m);
222 banner = buffer_get_string(&m, NULL); 222 banner = buffer_get_string(&m, NULL);
223 buffer_free(&m); 223 buffer_free(&m);
224 224
225 return (banner); 225 return (banner);
226} 226}
227 227
@@ -694,8 +694,8 @@ static void
694mm_chall_setup(char **name, char **infotxt, u_int *numprompts, 694mm_chall_setup(char **name, char **infotxt, u_int *numprompts,
695 char ***prompts, u_int **echo_on) 695 char ***prompts, u_int **echo_on)
696{ 696{
697 *name = xstrdup(""); 697 *name = xstrdup("");
698 *infotxt = xstrdup(""); 698 *infotxt = xstrdup("");
699 *numprompts = 1; 699 *numprompts = 1;
700 *prompts = xmalloc(*numprompts * sizeof(char*)); 700 *prompts = xmalloc(*numprompts * sizeof(char*));
701 *echo_on = xmalloc(*numprompts * sizeof(u_int)); 701 *echo_on = xmalloc(*numprompts * sizeof(u_int));