Re-import of OpenSSH 3.7.1p2 (Chase\!)

[gssapi-openssh.git] / openssh / monitor_wrap.c

diff --git a/openssh/monitor_wrap.c b/openssh/monitor_wrap.c
index e7c15cecd54f64db6b79cf8bcdd3ae6432a605d1..4034d569cdda669ad4eec90a754b9455effac859 100644 (file)
--- a/openssh/monitor_wrap.c
+++ b/openssh/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.31 2003/08/28 12:54:34 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -66,16 +66,6 @@ extern struct monitor *pmonitor;
 extern Buffer input, output;
 extern ServerOptions options;
 
-int
-mm_is_monitor(void)
-{
-       /*
-        * m_pid is only set in the privileged part, and
-        * points to the unprivileged child.
-        */
-       return (pmonitor && pmonitor->m_pid > 0);
-}
-
 void
 mm_request_send(int socket, enum monitor_reqtype type, Buffer *m)
 {
@@ -104,7 +94,7 @@ mm_request_receive(int socket, Buffer *m)
        res = atomicio(read, socket, buf, sizeof(buf));
        if (res != sizeof(buf)) {
                if (res == 0)
-                       cleanup_exit(255);
+                       fatal_cleanup();
                fatal("%s: read: %ld", __func__, (long)res);
        }
        msg_len = GET_32BIT(buf);
@@ -224,8 +214,7 @@ mm_getpwnamallow(const char *login)
        return (pw);
 }
 
-char *
-mm_auth2_read_banner(void)
+char *mm_auth2_read_banner(void)
 {
        Buffer m;
        char *banner;
@@ -236,16 +225,10 @@ mm_auth2_read_banner(void)
        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTH2_READ_BANNER, &m);
        buffer_clear(&m);
 
-       mm_request_receive_expect(pmonitor->m_recvfd,
-           MONITOR_ANS_AUTH2_READ_BANNER, &m);
+       mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTH2_READ_BANNER, &m);
        banner = buffer_get_string(&m, NULL);
        buffer_free(&m);
 
-       /* treat empty banner as missing banner */
-       if (strlen(banner) == 0) {
-               xfree(banner);
-               banner = NULL;
-       }
        return (banner);
 }
 
@@ -665,8 +648,9 @@ mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 }
 
 void
-mm_session_pty_cleanup2(Session *s)
+mm_session_pty_cleanup2(void *session)
 {
+       Session *s = session;
        Buffer m;
 
        if (s->ttyfd == -1)
@@ -715,12 +699,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);
@@ -1134,25 +1118,6 @@ 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)
 {