Debian release 3.6p1-1.

1 files changed, 22 insertions, 10 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index 4c53bfd13..1395a32f4 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.19 2002/09/26 11:38:43 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.22 2003/02/16 17:30:33 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -34,6 +34,7 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.19 2002/09/26 11:38:43 markus Exp $");
 #include "dh.h"
 #include "kex.h"
 #include "auth.h"
+#include "auth-options.h"
 #include "buffer.h"
 #include "bufaux.h"
 #include "packet.h"
@@ -312,7 +313,7 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key)
         Buffer m;
         u_char *blob;
         u_int len;
-        int allowed = 0;
+        int allowed = 0, have_forced = 0;
 
         debug3("%s entering", __func__);
 
@@ -334,6 +335,11 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key)
 
         allowed = buffer_get_int(&m);
 
+        /* fake forced command */
+        auth_clear_options();
+        have_forced = buffer_get_int(&m);
+        forced_command = have_forced ? xstrdup("true") : NULL;
+
         /* Send potential debug messages */
         mm_send_debug(&m);
 
@@ -714,7 +720,7 @@ mm_bsdauth_query(void *ctx, char **name, char **infotxt,
    u_int *numprompts, char ***prompts, u_int **echo_on)
 {
         Buffer m;
-        int res;
+        u_int success;
         char *challenge;
 
         debug3("%s: entering", __func__);
@@ -724,8 +730,8 @@ mm_bsdauth_query(void *ctx, char **name, char **infotxt,
 
         mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_BSDAUTHQUERY,
             &m);
-        res = buffer_get_int(&m);
-        if (res == -1) {
+        success = buffer_get_int(&m);
+        if (success == 0) {
                 debug3("%s: no challenge", __func__);
                 buffer_free(&m);
                 return (-1);
@@ -771,7 +777,8 @@ mm_skey_query(void *ctx, char **name, char **infotxt,
    u_int *numprompts, char ***prompts, u_int **echo_on)
 {
         Buffer m;
-        int len, res;
+        int len;
+        u_int success;
         char *p, *challenge;
 
         debug3("%s: entering", __func__);
@@ -781,8 +788,8 @@ mm_skey_query(void *ctx, char **name, char **infotxt,
 
         mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SKEYQUERY,
             &m);
-        res = buffer_get_int(&m);
-        if (res == -1) {
+        success = buffer_get_int(&m);
+        if (success == 0) {
                 debug3("%s: no challenge", __func__);
                 buffer_free(&m);
                 return (-1);
@@ -852,7 +859,7 @@ mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
         Key *key;
         u_char *blob;
         u_int blen;
-        int allowed = 0;
+        int allowed = 0, have_forced = 0;
 
         debug3("%s entering", __func__);
 
@@ -864,6 +871,11 @@ mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
 
         allowed = buffer_get_int(&m);
 
+        /* fake forced command */
+        auth_clear_options();
+        have_forced = buffer_get_int(&m);
+        forced_command = have_forced ? xstrdup("true") : NULL;
+
         if (allowed && rkey != NULL) {
                 blob = buffer_get_string(&m, &blen);
                 if ((key = key_from_blob(blob, blen)) == NULL)
@@ -969,7 +981,7 @@ mm_auth_krb4(Authctxt *authctxt, void *_auth, char **client, void *_reply)
                 xfree(p);
         }
         buffer_free(&m);
-        return (success); 
+        return (success);
 }
 #endif