- (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from

[openssh.git] / monitor_wrap.c

diff --git a/monitor_wrap.c b/monitor_wrap.c
index e19984ec0cd927a9979a5713f751fa19f0731515..f6bc34ec814413e17cc41d3ce7b29ca3e4048ae4 100644 (file)
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.33 2003/10/11 11:36:23 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.38 2004/07/03 11:02:25 dtucker Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -40,7 +40,13 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.33 2003/10/11 11:36:23 markus Exp $");
 #include "packet.h"
 #include "mac.h"
 #include "log.h"
+#ifdef TARGET_OS_MAC    /* XXX Broken krb5 headers on Mac */
+#undef TARGET_OS_MAC
 #include "zlib.h"
+#define TARGET_OS_MAC 1
+#else
+#include "zlib.h"
+#endif
 #include "monitor.h"
 #include "monitor_wrap.h"
 #include "xmalloc.h"
@@ -73,11 +79,11 @@ mm_is_monitor(void)
         * m_pid is only set in the privileged part, and
         * points to the unprivileged child.
         */
-       return (pmonitor->m_pid > 0);
+       return (pmonitor && pmonitor->m_pid > 0);
 }
 
 void
-mm_request_send(int socket, enum monitor_reqtype type, Buffer *m)
+mm_request_send(int sock, enum monitor_reqtype type, Buffer *m)
 {
        u_int mlen = buffer_len(m);
        u_char buf[5];
@@ -86,14 +92,14 @@ mm_request_send(int socket, enum monitor_reqtype type, Buffer *m)
 
        PUT_32BIT(buf, mlen + 1);
        buf[4] = (u_char) type;         /* 1st byte of payload is mesg-type */
-       if (atomicio(vwrite, socket, buf, sizeof(buf)) != sizeof(buf))
+       if (atomicio(vwrite, sock, buf, sizeof(buf)) != sizeof(buf))
                fatal("%s: write", __func__);
-       if (atomicio(vwrite, socket, buffer_ptr(m), mlen) != mlen)
+       if (atomicio(vwrite, sock, buffer_ptr(m), mlen) != mlen)
                fatal("%s: write", __func__);
 }
 
 void
-mm_request_receive(int socket, Buffer *m)
+mm_request_receive(int sock, Buffer *m)
 {
        u_char buf[4];
        u_int msg_len;
@@ -101,7 +107,7 @@ mm_request_receive(int socket, Buffer *m)
 
        debug3("%s entering", __func__);
 
-       res = atomicio(read, socket, buf, sizeof(buf));
+       res = atomicio(read, sock, buf, sizeof(buf));
        if (res != sizeof(buf)) {
                if (res == 0)
                        cleanup_exit(255);
@@ -112,19 +118,19 @@ mm_request_receive(int socket, Buffer *m)
                fatal("%s: read: bad msg_len %d", __func__, msg_len);
        buffer_clear(m);
        buffer_append_space(m, msg_len);
-       res = atomicio(read, socket, buffer_ptr(m), msg_len);
+       res = atomicio(read, sock, buffer_ptr(m), msg_len);
        if (res != msg_len)
                fatal("%s: read: %ld != msg_len", __func__, (long)res);
 }
 
 void
-mm_request_receive_expect(int socket, enum monitor_reqtype type, Buffer *m)
+mm_request_receive_expect(int sock, enum monitor_reqtype type, Buffer *m)
 {
        u_char rtype;
 
        debug3("%s entering: type %d", __func__, type);
 
-       mm_request_receive(socket, m);
+       mm_request_receive(sock, m);
        rtype = buffer_get_char(m);
        if (rtype != type)
                fatal("%s: read: rtype %d != type %d", __func__,
@@ -188,7 +194,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen)
 }
 
 struct passwd *
-mm_getpwnamallow(const char *login)
+mm_getpwnamallow(const char *username)
 {
        Buffer m;
        struct passwd *pw;
@@ -197,7 +203,7 @@ mm_getpwnamallow(const char *login)
        debug3("%s entering", __func__);
 
        buffer_init(&m);
-       buffer_put_cstring(&m, login);
+       buffer_put_cstring(&m, username);
 
        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m);
 
@@ -538,7 +544,7 @@ mm_send_kex(Buffer *m, Kex *kex)
 }
 
 void
-mm_send_keystate(struct monitor *pmonitor)
+mm_send_keystate(struct monitor *monitor)
 {
        Buffer m;
        u_char *blob, *p;
@@ -574,7 +580,7 @@ mm_send_keystate(struct monitor *pmonitor)
                goto skip;
        } else {
                /* Kex for rekeying */
-               mm_send_kex(&m, *pmonitor->m_pkex);
+               mm_send_kex(&m, *monitor->m_pkex);
        }
 
        debug3("%s: Sending new keys: %p %p",
@@ -626,7 +632,7 @@ mm_send_keystate(struct monitor *pmonitor)
        buffer_put_string(&m, buffer_ptr(&input), buffer_len(&input));
        buffer_put_string(&m, buffer_ptr(&output), buffer_len(&output));
 
-       mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m);
+       mm_request_send(monitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m);
        debug3("%s: Finished sending state", __func__);
 
        buffer_free(&m);
@@ -686,7 +692,7 @@ mm_session_pty_cleanup2(Session *s)
 
 #ifdef USE_PAM
 void
-mm_start_pam(char *user)
+mm_start_pam(Authctxt *authctxt)
 {
        Buffer m;
 
@@ -695,8 +701,6 @@ mm_start_pam(char *user)
                fatal("UsePAM=no, but ended up in %s anyway", __func__);
 
        buffer_init(&m);
-       buffer_put_cstring(&m, user);
-
        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_START, &m);
 
        buffer_free(&m);
@@ -715,12 +719,12 @@ mm_do_pam_account(void)
        buffer_init(&m);
        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_ACCOUNT, &m);
 
-       mm_request_receive_expect(pmonitor->m_recvfd, 
+       mm_request_receive_expect(pmonitor->m_recvfd,
            MONITOR_ANS_PAM_ACCOUNT, &m);
        ret = buffer_get_int(&m);
 
        buffer_free(&m);
-       
+
        debug3("%s returning %d", __func__, ret);
 
        return (ret);
@@ -910,6 +914,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses)
        return ((authok == 0) ? -1 : 0);
 }
 
+#ifdef SKEY
 int
 mm_skey_query(void *ctx, char **name, char **infotxt,
    u_int *numprompts, char ***prompts, u_int **echo_on)
@@ -973,6 +978,7 @@ mm_skey_respond(void *ctx, u_int numresponses, char **responses)
 
        return ((authok == 0) ? -1 : 0);
 }
+#endif /* SKEY */
 
 void
 mm_ssh1_session_id(u_char session_id[16])
@@ -1089,7 +1095,7 @@ mm_auth_rsa_verify_response(Key *key, BIGNUM *p, u_char response[16])
 
 #ifdef GSSAPI
 OM_uint32
-mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
+mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID goid)
 {
        Buffer m;
        OM_uint32 major;
@@ -1098,7 +1104,7 @@ mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
        *ctx = NULL;
 
        buffer_init(&m);
-       buffer_put_string(&m, oid->elements, oid->length);
+       buffer_put_string(&m, goid->elements, goid->length);
 
        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSETUP, &m);
        mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSETUP, &m);
@@ -1134,6 +1140,25 @@ mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in,
        return (major);
 }
 
+OM_uint32
+mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
+{
+       Buffer m;
+       OM_uint32 major;
+
+       buffer_init(&m);
+       buffer_put_string(&m, gssbuf->value, gssbuf->length);
+       buffer_put_string(&m, gssmic->value, gssmic->length);
+
+       mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSCHECKMIC, &m);
+       mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSCHECKMIC,
+           &m);
+
+       major = buffer_get_int(&m);
+       buffer_free(&m);
+       return(major);
+}
+
 int
 mm_ssh_gssapi_userok(char *user)
 {