28,29c28,29
< RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
< RCSID("$FreeBSD: head/crypto/openssh/monitor.c 128460 2004-04-20 09:46:41Z des $");
---
> RCSID("$OpenBSD: monitor.c,v 1.61 2004/07/17 05:31:41 dtucker Exp $");
> RCSID("$FreeBSD: head/crypto/openssh/monitor.c 137019 2004-10-28 16:11:31Z des $");
75d74
< #include "mpaux.h"
91a91
> extern Buffer loginmsg;
363c363
< monitor_child_handler(int signal)
---
> monitor_child_handler(int sig)
365c365
< kill(monitor_child_pid, signal);
---
> kill(monitor_child_pid, sig);
480c480
< mm_answer_moduli(int socket, Buffer *m)
---
> mm_answer_moduli(int sock, Buffer *m)
510c510
< mm_request_send(socket, MONITOR_ANS_MODULI, m);
---
> mm_request_send(sock, MONITOR_ANS_MODULI, m);
515c515
< mm_answer_sign(int socket, Buffer *m)
---
> mm_answer_sign(int sock, Buffer *m)
551c551
< mm_request_send(socket, MONITOR_ANS_SIGN, m);
---
> mm_request_send(sock, MONITOR_ANS_SIGN, m);
562c562
< mm_answer_pwnamallow(int socket, Buffer *m)
---
> mm_answer_pwnamallow(int sock, Buffer *m)
564c564
< char *login;
---
> char *username;
573c573
< login = buffer_get_string(m, NULL);
---
> username = buffer_get_string(m, NULL);
575c575
< pwent = getpwnamallow(login);
---
> pwent = getpwnamallow(username);
577,579c577,579
< authctxt->user = xstrdup(login);
< setproctitle("%s [priv]", pwent ? login : "unknown");
< xfree(login);
---
> authctxt->user = xstrdup(username);
> setproctitle("%s [priv]", pwent ? username : "unknown");
> xfree(username);
606c606
< mm_request_send(socket, MONITOR_ANS_PWNAM, m);
---
> mm_request_send(sock, MONITOR_ANS_PWNAM, m);
625c625
< int mm_answer_auth2_read_banner(int socket, Buffer *m)
---
> int mm_answer_auth2_read_banner(int sock, Buffer *m)
632c632
< mm_request_send(socket, MONITOR_ANS_AUTH2_READ_BANNER, m);
---
> mm_request_send(sock, MONITOR_ANS_AUTH2_READ_BANNER, m);
641c641
< mm_answer_authserv(int socket, Buffer *m)
---
> mm_answer_authserv(int sock, Buffer *m)
659c659
< mm_answer_authpassword(int socket, Buffer *m)
---
> mm_answer_authpassword(int sock, Buffer *m)
677c677
< mm_request_send(socket, MONITOR_ANS_AUTHPASSWORD, m);
---
> mm_request_send(sock, MONITOR_ANS_AUTHPASSWORD, m);
691c691
< mm_answer_bsdauthquery(int socket, Buffer *m)
---
> mm_answer_bsdauthquery(int sock, Buffer *m)
708c708
< mm_request_send(socket, MONITOR_ANS_BSDAUTHQUERY, m);
---
> mm_request_send(sock, MONITOR_ANS_BSDAUTHQUERY, m);
721c721
< mm_answer_bsdauthrespond(int socket, Buffer *m)
---
> mm_answer_bsdauthrespond(int sock, Buffer *m)
740c740
< mm_request_send(socket, MONITOR_ANS_BSDAUTHRESPOND, m);
---
> mm_request_send(sock, MONITOR_ANS_BSDAUTHRESPOND, m);
750c750
< mm_answer_skeyquery(int socket, Buffer *m)
---
> mm_answer_skeyquery(int sock, Buffer *m)
765c765
< mm_request_send(socket, MONITOR_ANS_SKEYQUERY, m);
---
> mm_request_send(sock, MONITOR_ANS_SKEYQUERY, m);
771c771
< mm_answer_skeyrespond(int socket, Buffer *m)
---
> mm_answer_skeyrespond(int sock, Buffer *m)
789c789
< mm_request_send(socket, MONITOR_ANS_SKEYRESPOND, m);
---
> mm_request_send(sock, MONITOR_ANS_SKEYRESPOND, m);
799c799
< mm_answer_pam_start(int socket, Buffer *m)
---
> mm_answer_pam_start(int sock, Buffer *m)
812c812
< mm_answer_pam_account(int socket, Buffer *m)
---
> mm_answer_pam_account(int sock, Buffer *m)
823c823
< mm_request_send(socket, MONITOR_ANS_PAM_ACCOUNT, m);
---
> mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m);
832c832
< mm_answer_pam_init_ctx(int socket, Buffer *m)
---
> mm_answer_pam_init_ctx(int sock, Buffer *m)
846c846
< mm_request_send(socket, MONITOR_ANS_PAM_INIT_CTX, m);
---
> mm_request_send(sock, MONITOR_ANS_PAM_INIT_CTX, m);
851c851
< mm_answer_pam_query(int socket, Buffer *m)
---
> mm_answer_pam_query(int sock, Buffer *m)
880c880
< mm_request_send(socket, MONITOR_ANS_PAM_QUERY, m);
---
> mm_request_send(sock, MONITOR_ANS_PAM_QUERY, m);
885c885
< mm_answer_pam_respond(int socket, Buffer *m)
---
> mm_answer_pam_respond(int sock, Buffer *m)
907c907
< mm_request_send(socket, MONITOR_ANS_PAM_RESPOND, m);
---
> mm_request_send(sock, MONITOR_ANS_PAM_RESPOND, m);
915c915
< mm_answer_pam_free_ctx(int socket, Buffer *m)
---
> mm_answer_pam_free_ctx(int sock, Buffer *m)
921c921
< mm_request_send(socket, MONITOR_ANS_PAM_FREE_CTX, m);
---
> mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
938c938
< mm_answer_keyallowed(int socket, Buffer *m)
---
> mm_answer_keyallowed(int sock, Buffer *m)
1008c1008
< mm_request_send(socket, MONITOR_ANS_KEYALLOWED, m);
---
> mm_request_send(sock, MONITOR_ANS_KEYALLOWED, m);
1129c1129
< mm_answer_keyverify(int socket, Buffer *m)
---
> mm_answer_keyverify(int sock, Buffer *m)
1179c1179
< mm_request_send(socket, MONITOR_ANS_KEYVERIFY, m);
---
> mm_request_send(sock, MONITOR_ANS_KEYVERIFY, m);
1221c1221
< mm_answer_pty(int socket, Buffer *m)
---
> mm_answer_pty(int sock, Buffer *m)
1243d1242
< mm_request_send(socket, MONITOR_ANS_PTY, m);
1245,1247d1243
< mm_send_fd(socket, s->ptyfd);
< mm_send_fd(socket, s->ttyfd);
<
1256a1253,1261
> /* send messages generated by record_login */
> buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg));
> buffer_clear(&loginmsg);
>
> mm_request_send(sock, MONITOR_ANS_PTY, m);
>
> mm_send_fd(sock, s->ptyfd);
> mm_send_fd(sock, s->ttyfd);
>
1277c1282
< mm_request_send(socket, MONITOR_ANS_PTY, m);
---
> mm_request_send(sock, MONITOR_ANS_PTY, m);
1282c1287
< mm_answer_pty_cleanup(int socket, Buffer *m)
---
> mm_answer_pty_cleanup(int sock, Buffer *m)
1298c1303
< mm_answer_sesskey(int socket, Buffer *m)
---
> mm_answer_sesskey(int sock, Buffer *m)
1319c1324
< mm_request_send(socket, MONITOR_ANS_SESSKEY, m);
---
> mm_request_send(sock, MONITOR_ANS_SESSKEY, m);
1328c1333
< mm_answer_sessid(int socket, Buffer *m)
---
> mm_answer_sessid(int sock, Buffer *m)
1346c1351
< mm_answer_rsa_keyallowed(int socket, Buffer *m)
---
> mm_answer_rsa_keyallowed(int sock, Buffer *m)
1386c1391
< mm_request_send(socket, MONITOR_ANS_RSAKEYALLOWED, m);
---
> mm_request_send(sock, MONITOR_ANS_RSAKEYALLOWED, m);
1394c1399
< mm_answer_rsa_challenge(int socket, Buffer *m)
---
> mm_answer_rsa_challenge(int sock, Buffer *m)
1420c1425
< mm_request_send(socket, MONITOR_ANS_RSACHALLENGE, m);
---
> mm_request_send(sock, MONITOR_ANS_RSACHALLENGE, m);
1430c1435
< mm_answer_rsa_response(int socket, Buffer *m)
---
> mm_answer_rsa_response(int sock, Buffer *m)
1469c1474
< mm_request_send(socket, MONITOR_ANS_RSARESPONSE, m);
---
> mm_request_send(sock, MONITOR_ANS_RSARESPONSE, m);
1475c1480
< mm_answer_term(int socket, Buffer *req)
---
> mm_answer_term(int sock, Buffer *req)
1492c1497
< exit (res);
---
> exit(res);
1558a1564
> kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
1752c1758
< mm_answer_gss_setup_ctx(int socket, Buffer *m)
---
> mm_answer_gss_setup_ctx(int sock, Buffer *m)
1754c1760
< gss_OID_desc oid;
---
> gss_OID_desc goid;
1758,1759c1764,1765
< oid.elements = buffer_get_string(m, &len);
< oid.length = len;
---
> goid.elements = buffer_get_string(m, &len);
> goid.length = len;
1761c1767
< major = ssh_gssapi_server_ctx(&gsscontext, &oid);
---
> major = ssh_gssapi_server_ctx(&gsscontext, &goid);
1763c1769
< xfree(oid.elements);
---
> xfree(goid.elements);
1768c1774
< mm_request_send(socket,MONITOR_ANS_GSSSETUP, m);
---
> mm_request_send(sock,MONITOR_ANS_GSSSETUP, m);
1777c1783
< mm_answer_gss_accept_ctx(int socket, Buffer *m)
---
> mm_answer_gss_accept_ctx(int sock, Buffer *m)
1794c1800
< mm_request_send(socket, MONITOR_ANS_GSSSTEP, m);
---
> mm_request_send(sock, MONITOR_ANS_GSSSTEP, m);
1807c1813
< mm_answer_gss_checkmic(int socket, Buffer *m)
---
> mm_answer_gss_checkmic(int sock, Buffer *m)
1826c1832
< mm_request_send(socket, MONITOR_ANS_GSSCHECKMIC, m);
---
> mm_request_send(sock, MONITOR_ANS_GSSCHECKMIC, m);
1835c1841
< mm_answer_gss_userok(int socket, Buffer *m)
---
> mm_answer_gss_userok(int sock, Buffer *m)
1845c1851
< mm_request_send(socket, MONITOR_ANS_GSSUSEROK, m);
---
> mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m);