1 files changed, 48 insertions, 27 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index c94675c6f..b0ced5ac7 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: monitor_wrap.c,v 1.55 2007/02/19 10:45:58 dtucker Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -25,18 +26,31 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.40 2005/05/24 17:32:43 avsm Exp $");
+
+#include <sys/types.h>
+#include <sys/uio.h>
+
+#include <errno.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
+#include "xmalloc.h"
 #include "ssh.h"
 #include "dh.h"
+#include "buffer.h"
+#include "key.h"
+#include "cipher.h"
 #include "kex.h"
+#include "hostfile.h"
 #include "auth.h"
 #include "auth-options.h"
-#include "buffer.h"
-#include "bufaux.h"
 #include "packet.h"
 #include "mac.h"
 #include "log.h"
@@ -48,20 +62,18 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.40 2005/05/24 17:32:43 avsm Exp $");
 #include "zlib.h"
 #endif
 #include "monitor.h"
+#ifdef GSSAPI
+#include "ssh-gss.h"
+#endif
 #include "monitor_wrap.h"
-#include "xmalloc.h"
 #include "atomicio.h"
 #include "monitor_fdpass.h"
-#include "getput.h"
+#include "misc.h"
 #include "servconf.h"
 
-#include "auth.h"
 #include "channels.h"
 #include "session.h"
-
-#ifdef GSSAPI
-#include "ssh-gss.h"
-#endif
+#include "servconf.h"
 
 /* Imports */
 extern int compat20;
@@ -91,7 +103,7 @@ mm_request_send(int sock, enum monitor_reqtype type, Buffer *m)
 
         debug3("%s entering: type %d", __func__, type);
 
-        PUT_32BIT(buf, mlen + 1);
+        put_u32(buf, mlen + 1);
         buf[4] = (u_char) type;         /* 1st byte of payload is mesg-type */
         if (atomicio(vwrite, sock, buf, sizeof(buf)) != sizeof(buf))
                 fatal("%s: write: %s", __func__, strerror(errno));
@@ -112,7 +124,7 @@ mm_request_receive(int sock, Buffer *m)
                         cleanup_exit(255);
                 fatal("%s: read: %s", __func__, strerror(errno));
         }
-        msg_len = GET_32BIT(buf);
+        msg_len = get_u32(buf);
         if (msg_len > 256 * 1024)
                 fatal("%s: read: bad msg_len %d", __func__, msg_len);
         buffer_clear(m);
@@ -196,7 +208,8 @@ mm_getpwnamallow(const char *username)
 {
         Buffer m;
         struct passwd *pw;
-        u_int pwlen;
+        u_int len;
+        ServerOptions *newopts;
 
         debug3("%s entering", __func__);
 
@@ -212,8 +225,8 @@ mm_getpwnamallow(const char *username)
                 buffer_free(&m);
                 return (NULL);
         }
-        pw = buffer_get_string(&m, &pwlen);
-        if (pwlen != sizeof(struct passwd))
+        pw = buffer_get_string(&m, &len);
+        if (len != sizeof(struct passwd))
                 fatal("%s: struct passwd size mismatch", __func__);
         pw->pw_name = buffer_get_string(&m, NULL);
         pw->pw_passwd = buffer_get_string(&m, NULL);
@@ -223,6 +236,16 @@ mm_getpwnamallow(const char *username)
 #endif
         pw->pw_dir = buffer_get_string(&m, NULL);
         pw->pw_shell = buffer_get_string(&m, NULL);
+
+        /* copy options block as a Match directive may have changed some */
+        newopts = buffer_get_string(&m, &len);
+        if (len != sizeof(*newopts))
+                fatal("%s: option block size mismatch", __func__);
+        if (newopts->banner != NULL)
+                newopts->banner = buffer_get_string(&m, NULL);
+        copy_set_server_options(&options, newopts, 1);
+        xfree(newopts);
+
         buffer_free(&m);
 
         return (pw);
@@ -637,7 +660,7 @@ mm_send_keystate(struct monitor *monitor)
 }
 
 int
-mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
+mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen)
 {
         Buffer m;
         char *p, *msg;
@@ -776,8 +799,11 @@ mm_sshpam_query(void *ctx, char **name, char **info,
         *name = buffer_get_string(&m, NULL);
         *info = buffer_get_string(&m, NULL);
         *num = buffer_get_int(&m);
-        *prompts = xmalloc((*num + 1) * sizeof(char *));
-        *echo_on = xmalloc((*num + 1) * sizeof(u_int));
+        if (*num > PAM_MAX_NUM_MSG)
+                fatal("%s: recieved %u PAM messages, expected <= %u",
+                    __func__, *num, PAM_MAX_NUM_MSG);
+        *prompts = xcalloc((*num + 1), sizeof(char *));
+        *echo_on = xcalloc((*num + 1), sizeof(u_int));
         for (i = 0; i < *num; ++i) {
                 (*prompts)[i] = buffer_get_string(&m, NULL);
                 (*echo_on)[i] = buffer_get_int(&m);
@@ -860,8 +886,8 @@ mm_chall_setup(char **name, char **infotxt, u_int *numprompts,
         *name = xstrdup("");
         *infotxt = xstrdup("");
         *numprompts = 1;
-        *prompts = xmalloc(*numprompts * sizeof(char *));
-        *echo_on = xmalloc(*numprompts * sizeof(u_int));
+        *prompts = xcalloc(*numprompts, sizeof(char *));
+        *echo_on = xcalloc(*numprompts, sizeof(u_int));
         (*echo_on)[0] = 0;
 }
 
@@ -928,9 +954,8 @@ mm_skey_query(void *ctx, char **name, char **infotxt,
    u_int *numprompts, char ***prompts, u_int **echo_on)
 {
         Buffer m;
-        int len;
         u_int success;
-        char *p, *challenge;
+        char *challenge;
 
         debug3("%s: entering", __func__);
 
@@ -954,11 +979,7 @@ mm_skey_query(void *ctx, char **name, char **infotxt,
 
         mm_chall_setup(name, infotxt, numprompts, prompts, echo_on);
 
-        len = strlen(challenge) + strlen(SKEY_PROMPT) + 1;
-        p = xmalloc(len);
-        strlcpy(p, challenge, len);
-        strlcat(p, SKEY_PROMPT, len);
-        (*prompts)[0] = p;
+        xasprintf(*prompts, "%s%s", challenge, SKEY_PROMPT);
         xfree(challenge);
 
         return (0);