28,29c28,29
< RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $");
< RCSID("$FreeBSD: head/crypto/openssh/monitor_wrap.c 128460 2004-04-20 09:46:41Z des $");
---
> RCSID("$OpenBSD: monitor_wrap.c,v 1.39 2004/07/17 05:31:41 dtucker Exp $");
> RCSID("$FreeBSD: head/crypto/openssh/monitor_wrap.c 137019 2004-10-28 16:11:31Z des $");
73a74
> extern Buffer loginmsg;
87c88
< mm_request_send(int socket, enum monitor_reqtype type, Buffer *m)
---
> mm_request_send(int sock, enum monitor_reqtype type, Buffer *m)
96c97
< if (atomicio(vwrite, socket, buf, sizeof(buf)) != sizeof(buf))
---
> if (atomicio(vwrite, sock, buf, sizeof(buf)) != sizeof(buf))
98c99
< if (atomicio(vwrite, socket, buffer_ptr(m), mlen) != mlen)
---
> if (atomicio(vwrite, sock, buffer_ptr(m), mlen) != mlen)
103c104
< mm_request_receive(int socket, Buffer *m)
---
> mm_request_receive(int sock, Buffer *m)
111c112
< res = atomicio(read, socket, buf, sizeof(buf));
---
> res = atomicio(read, sock, buf, sizeof(buf));
122c123
< res = atomicio(read, socket, buffer_ptr(m), msg_len);
---
> res = atomicio(read, sock, buffer_ptr(m), msg_len);
128c129
< mm_request_receive_expect(int socket, enum monitor_reqtype type, Buffer *m)
---
> mm_request_receive_expect(int sock, enum monitor_reqtype type, Buffer *m)
134c135
< mm_request_receive(socket, m);
---
> mm_request_receive(sock, m);
198c199
< mm_getpwnamallow(const char *login)
---
> mm_getpwnamallow(const char *username)
207c208
< buffer_put_cstring(&m, login);
---
> buffer_put_cstring(&m, username);
548c549
< mm_send_keystate(struct monitor *pmonitor)
---
> mm_send_keystate(struct monitor *monitor)
584c585
< mm_send_kex(&m, *pmonitor->m_pkex);
---
> mm_send_kex(&m, *monitor->m_pkex);
636c637
< mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m);
---
> mm_request_send(monitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m);
646c647
< char *p;
---
> char *p, *msg;
661a663
> msg = buffer_get_string(&m, NULL);
666a669,671
> buffer_append(&loginmsg, msg, strlen(msg));
> xfree(msg);
>
982c987
< #endif
---
> #endif /* SKEY */
1099c1104
< mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
---
> mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID goid)
1108c1113
< buffer_put_string(&m, oid->elements, oid->length);
---
> buffer_put_string(&m, goid->elements, goid->length);