===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/monitor_wrap.c,v
retrieving revision 1.5.2.5
retrieving revision 1.6
diff -u -r1.5.2.5 -r1.6
--- src/usr.bin/ssh/monitor_wrap.c	2003/04/03 22:35:17	1.5.2.5
+++ src/usr.bin/ssh/monitor_wrap.c	2002/05/12 23:53:45	1.6
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.5.2.5 2003/04/03 22:35:17 miod Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.6 2002/05/12 23:53:45 djm Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -34,7 +34,6 @@
 #include "dh.h"
 #include "kex.h"
 #include "auth.h"
-#include "auth-options.h"
 #include "buffer.h"
 #include "bufaux.h"
 #include "packet.h"
@@ -57,48 +56,48 @@
 extern Newkeys *newkeys[];
 extern z_stream incoming_stream;
 extern z_stream outgoing_stream;
-extern struct monitor *pmonitor;
+extern struct monitor *monitor;
 extern Buffer input, output;
 
 void
 mm_request_send(int socket, enum monitor_reqtype type, Buffer *m)
 {
-	u_int mlen = buffer_len(m);
 	u_char buf[5];
+	u_int mlen = buffer_len(m);
 
-	debug3("%s entering: type %d", __func__, type);
+	debug3("%s entering: type %d", __FUNCTION__, type);
 
 	PUT_32BIT(buf, mlen + 1);
-	buf[4] = (u_char) type;		/* 1st byte of payload is mesg-type */
+	buf[4] = (u_char) type;         /* 1st byte of payload is mesg-type */
 	if (atomicio(write, socket, buf, sizeof(buf)) != sizeof(buf))
-		fatal("%s: write", __func__);
+		fatal("%s: write", __FUNCTION__);
 	if (atomicio(write, socket, buffer_ptr(m), mlen) != mlen)
-		fatal("%s: write", __func__);
+		fatal("%s: write", __FUNCTION__);
 }
 
 void
 mm_request_receive(int socket, Buffer *m)
 {
 	u_char buf[4];
-	u_int msg_len;
 	ssize_t res;
+	u_int msg_len;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	res = atomicio(read, socket, buf, sizeof(buf));
 	if (res != sizeof(buf)) {
 		if (res == 0)
 			fatal_cleanup();
-		fatal("%s: read: %ld", __func__, (long)res);
+		fatal("%s: read: %ld", __FUNCTION__, (long)res);
 	}
 	msg_len = GET_32BIT(buf);
 	if (msg_len > 256 * 1024)
-		fatal("%s: read: bad msg_len %d", __func__, msg_len);
+		fatal("%s: read: bad msg_len %d", __FUNCTION__, msg_len);
 	buffer_clear(m);
 	buffer_append_space(m, msg_len);
 	res = atomicio(read, socket, buffer_ptr(m), msg_len);
 	if (res != msg_len)
-		fatal("%s: read: %ld != msg_len", __func__, (long)res);
+		fatal("%s: read: %ld != msg_len", __FUNCTION__, (long)res);
 }
 
 void
@@ -106,12 +105,12 @@
 {
 	u_char rtype;
 
-	debug3("%s entering: type %d", __func__, type);
+	debug3("%s entering: type %d", __FUNCTION__, type);
 
 	mm_request_receive(socket, m);
 	rtype = buffer_get_char(m);
 	if (rtype != type)
-		fatal("%s: read: rtype %d != type %d", __func__,
+		fatal("%s: read: rtype %d != type %d", __FUNCTION__,
 		    rtype, type);
 }
 
@@ -127,23 +126,23 @@
 	buffer_put_int(&m, nbits);
 	buffer_put_int(&m, max);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_MODULI, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_MODULI, &m);
 
-	debug3("%s: waiting for MONITOR_ANS_MODULI", __func__);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_MODULI, &m);
+	debug3("%s: waiting for MONITOR_ANS_MODULI", __FUNCTION__);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_MODULI, &m);
 
 	success = buffer_get_char(&m);
 	if (success == 0)
-		fatal("%s: MONITOR_ANS_MODULI failed", __func__);
+		fatal("%s: MONITOR_ANS_MODULI failed", __FUNCTION__);
 
 	if ((p = BN_new()) == NULL)
-		fatal("%s: BN_new failed", __func__);
+		fatal("%s: BN_new failed", __FUNCTION__);
 	if ((g = BN_new()) == NULL)
-		fatal("%s: BN_new failed", __func__);
+		fatal("%s: BN_new failed", __FUNCTION__);
 	buffer_get_bignum2(&m, p);
 	buffer_get_bignum2(&m, g);
 
-	debug3("%s: remaining %d", __func__, buffer_len(&m));
+	debug3("%s: remaining %d", __FUNCTION__, buffer_len(&m));
 	buffer_free(&m);
 
 	return (dh_new_group(g, p));
@@ -152,19 +151,19 @@
 int
 mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen)
 {
-	Kex *kex = *pmonitor->m_pkex;
+	Kex *kex = *monitor->m_pkex;
 	Buffer m;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	buffer_init(&m);
 	buffer_put_int(&m, kex->host_key_index(key));
 	buffer_put_string(&m, data, datalen);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_SIGN, &m);
 
-	debug3("%s: waiting for MONITOR_ANS_SIGN", __func__);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SIGN, &m);
+	debug3("%s: waiting for MONITOR_ANS_SIGN", __FUNCTION__);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_SIGN, &m);
 	*sigp  = buffer_get_string(&m, lenp);
 	buffer_free(&m);
 
@@ -178,15 +177,15 @@
 	struct passwd *pw;
 	u_int pwlen;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	buffer_init(&m);
 	buffer_put_cstring(&m, login);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_PWNAM, &m);
 
-	debug3("%s: waiting for MONITOR_ANS_PWNAM", __func__);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PWNAM, &m);
+	debug3("%s: waiting for MONITOR_ANS_PWNAM", __FUNCTION__);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_PWNAM, &m);
 
 	if (buffer_get_char(&m) == 0) {
 		buffer_free(&m);
@@ -194,7 +193,7 @@
 	}
 	pw = buffer_get_string(&m, &pwlen);
 	if (pwlen != sizeof(struct passwd))
-		fatal("%s: struct passwd size mismatch", __func__);
+		fatal("%s: struct passwd size mismatch", __FUNCTION__);
 	pw->pw_name = buffer_get_string(&m, NULL);
 	pw->pw_passwd = buffer_get_string(&m, NULL);
 	pw->pw_gecos = buffer_get_string(&m, NULL);
@@ -206,21 +205,21 @@
 	return (pw);
 }
 
-char *mm_auth2_read_banner(void)
+char* mm_auth2_read_banner(void)
 {
 	Buffer m;
 	char *banner;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	buffer_init(&m);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTH2_READ_BANNER, &m);
+	mm_request_send(monitor->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(monitor->m_recvfd, MONITOR_ANS_AUTH2_READ_BANNER, &m);
 	banner = buffer_get_string(&m, NULL);
 	buffer_free(&m);
-
+	
 	return (banner);
 }
 
@@ -231,13 +230,13 @@
 {
 	Buffer m;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	buffer_init(&m);
 	buffer_put_cstring(&m, service);
 	buffer_put_cstring(&m, style ? style : "");
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHSERV, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_AUTHSERV, &m);
 
 	buffer_free(&m);
 }
@@ -249,21 +248,21 @@
 	Buffer m;
 	int authenticated = 0;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	buffer_init(&m);
 	buffer_put_cstring(&m, password);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHPASSWORD, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_AUTHPASSWORD, &m);
 
-	debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __func__);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTHPASSWORD, &m);
+	debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __FUNCTION__);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_AUTHPASSWORD, &m);
 
 	authenticated = buffer_get_int(&m);
 
 	buffer_free(&m);
 
 	debug3("%s: user %sauthenticated",
-	    __func__, authenticated ? "" : "not ");
+	    __FUNCTION__, authenticated ? "" : "not ");
 	return (authenticated);
 }
 
@@ -299,7 +298,7 @@
 
 	while (buffer_len(m)) {
 		msg = buffer_get_string(m, NULL);
-		debug3("%s: Sending debug: %s", __func__, msg);
+		debug3("%s: Sending debug: %s", __FUNCTION__, msg);
 		packet_send_debug("%s", msg);
 		xfree(msg);
 	}
@@ -311,9 +310,9 @@
 	Buffer m;
 	u_char *blob;
 	u_int len;
-	int allowed = 0, have_forced = 0;
+	int allowed = 0;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	/* Convert the key to a blob and the pass it over */
 	if (!key_to_blob(key, &blob, &len))
@@ -326,18 +325,13 @@
 	buffer_put_string(&m, blob, len);
 	xfree(blob);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m);
 
-	debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __func__);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYALLOWED, &m);
+	debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __FUNCTION__);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_KEYALLOWED, &m);
 
 	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);
 
@@ -360,7 +354,7 @@
 	u_int len;
 	int verified = 0;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	/* Convert the key to a blob and the pass it over */
 	if (!key_to_blob(key, &blob, &len))
@@ -372,10 +366,10 @@
 	buffer_put_string(&m, data, datalen);
 	xfree(blob);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m);
 
-	debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __func__);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYVERIFY, &m);
+	debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __FUNCTION__);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_KEYVERIFY, &m);
 
 	verified = buffer_get_int(&m);
 
@@ -395,7 +389,7 @@
 	Mac *mac;
 	Comp *comp;
 
-	debug3("%s: %p(%d)", __func__, blob, blen);
+	debug3("%s: %p(%d)", __FUNCTION__, blob, blen);
 #ifdef DEBUG_PK
 	dump_base64(stderr, blob, blen);
 #endif
@@ -415,21 +409,21 @@
 	enc->key = buffer_get_string(&b, &enc->key_len);
 	enc->iv = buffer_get_string(&b, &len);
 	if (len != enc->block_size)
-		fatal("%s: bad ivlen: expected %u != %u", __func__,
+		fatal("%s: bad ivlen: expected %d != %d", __FUNCTION__,
 		    enc->block_size, len);
 
 	if (enc->name == NULL || cipher_by_name(enc->name) != enc->cipher)
-		fatal("%s: bad cipher name %s or pointer %p", __func__,
+		fatal("%s: bad cipher name %s or pointer %p", __FUNCTION__,
 		    enc->name, enc->cipher);
 
 	/* Mac structure */
 	mac->name = buffer_get_string(&b, NULL);
 	if (mac->name == NULL || mac_init(mac, mac->name) == -1)
-		fatal("%s: can not init mac %s", __func__, mac->name);
+		fatal("%s: can not init mac %s", __FUNCTION__, mac->name);
 	mac->enabled = buffer_get_int(&b);
 	mac->key = buffer_get_string(&b, &len);
 	if (len > mac->key_len)
-		fatal("%s: bad mac key length: %u > %d", __func__, len,
+		fatal("%s: bad mac key lenght: %d > %d", __FUNCTION__, len,
 		    mac->key_len);
 	mac->key_len = len;
 
@@ -440,7 +434,7 @@
 
 	len = buffer_len(&b);
 	if (len != 0)
-		error("newkeys_from_blob: remaining bytes in blob %u", len);
+		error("newkeys_from_blob: remaining bytes in blob %d", len);
 	buffer_free(&b);
 	return (newkey);
 }
@@ -450,15 +444,16 @@
 {
 	Buffer b;
 	int len;
+	u_char *buf;
 	Enc *enc;
 	Mac *mac;
 	Comp *comp;
 	Newkeys *newkey = newkeys[mode];
 
-	debug3("%s: converting %p", __func__, newkey);
+	debug3("%s: converting %p", __FUNCTION__, newkey);
 
 	if (newkey == NULL) {
-		error("%s: newkey == NULL", __func__);
+		error("%s: newkey == NULL", __FUNCTION__);
 		return 0;
 	}
 	enc = &newkey->enc;
@@ -487,14 +482,14 @@
 	buffer_put_cstring(&b, comp->name);
 
 	len = buffer_len(&b);
-	if (lenp != NULL)
-		*lenp = len;
-	if (blobp != NULL) {
-		*blobp = xmalloc(len);
-		memcpy(*blobp, buffer_ptr(&b), len);
-	}
+	buf = xmalloc(len);
+	memcpy(buf, buffer_ptr(&b), len);
 	memset(buffer_ptr(&b), 0, len);
 	buffer_free(&b);
+	if (lenp != NULL)
+		*lenp = len;
+	if (blobp != NULL)
+		*blobp = buf;
 	return len;
 }
 
@@ -513,7 +508,7 @@
 }
 
 void
-mm_send_keystate(struct monitor *pmonitor)
+mm_send_keystate(struct monitor *monitor)
 {
 	Buffer m;
 	u_char *blob, *p;
@@ -523,21 +518,13 @@
 
 	if (!compat20) {
 		u_char iv[24];
-		u_char *key;
-		u_int ivlen, keylen;
+		int ivlen;
 
 		buffer_put_int(&m, packet_get_protocol_flags());
 
 		buffer_put_int(&m, packet_get_ssh1_cipher());
 
-		debug3("%s: Sending ssh1 KEY+IV", __func__);
-		keylen = packet_get_encryption_key(NULL);
-		key = xmalloc(keylen+1);	/* add 1 if keylen == 0 */
-		keylen = packet_get_encryption_key(key);
-		buffer_put_string(&m, key, keylen);
-		memset(key, 0, keylen);
-		xfree(key);
-
+		debug3("%s: Sending ssh1 IV", __FUNCTION__);
 		ivlen = packet_get_keyiv_len(MODE_OUT);
 		packet_get_keyiv(MODE_OUT, iv, ivlen);
 		buffer_put_string(&m, iv, ivlen);
@@ -547,21 +534,21 @@
 		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",
-	    __func__, newkeys[MODE_OUT], newkeys[MODE_IN]);
+	    __FUNCTION__, newkeys[MODE_OUT], newkeys[MODE_IN]);
 
 	/* Keys from Kex */
 	if (!mm_newkeys_to_blob(MODE_OUT, &blob, &bloblen))
-		fatal("%s: conversion of newkeys failed", __func__);
+		fatal("%s: conversion of newkeys failed", __FUNCTION__);
 
 	buffer_put_string(&m, blob, bloblen);
 	xfree(blob);
 
 	if (!mm_newkeys_to_blob(MODE_IN, &blob, &bloblen))
-		fatal("%s: conversion of newkeys failed", __func__);
+		fatal("%s: conversion of newkeys failed", __FUNCTION__);
 
 	buffer_put_string(&m, blob, bloblen);
 	xfree(blob);
@@ -569,7 +556,7 @@
 	buffer_put_int(&m, packet_get_seqnr(MODE_OUT));
 	buffer_put_int(&m, packet_get_seqnr(MODE_IN));
 
-	debug3("%s: New keys have been sent", __func__);
+	debug3("%s: New keys have been sent", __FUNCTION__);
  skip:
 	/* More key context */
 	plen = packet_get_keycontext(MODE_OUT, NULL);
@@ -585,7 +572,7 @@
 	xfree(p);
 
 	/* Compression state */
-	debug3("%s: Sending compression state", __func__);
+	debug3("%s: Sending compression state", __FUNCTION__);
 	buffer_put_string(&m, &outgoing_stream, sizeof(outgoing_stream));
 	buffer_put_string(&m, &incoming_stream, sizeof(incoming_stream));
 
@@ -593,8 +580,8 @@
 	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);
-	debug3("%s: Finished sending state", __func__);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m);
+	debug3("%s: Finished sending state", __FUNCTION__);
 
 	buffer_free(&m);
 }
@@ -603,18 +590,18 @@
 mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 {
 	Buffer m;
-	char *p;
+	u_char *p;
 	int success = 0;
 
 	buffer_init(&m);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTY, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_PTY, &m);
 
-	debug3("%s: waiting for MONITOR_ANS_PTY", __func__);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PTY, &m);
+	debug3("%s: waiting for MONITOR_ANS_PTY", __FUNCTION__);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_PTY, &m);
 
 	success = buffer_get_int(&m);
 	if (success == 0) {
-		debug3("%s: pty alloc failed", __func__);
+		debug3("%s: pty alloc failed", __FUNCTION__);
 		buffer_free(&m);
 		return (0);
 	}
@@ -624,8 +611,8 @@
 	strlcpy(namebuf, p, namebuflen); /* Possible truncation */
 	xfree(p);
 
-	*ptyfd = mm_receive_fd(pmonitor->m_recvfd);
-	*ttyfd = mm_receive_fd(pmonitor->m_recvfd);
+	*ptyfd = mm_receive_fd(monitor->m_recvfd);
+	*ttyfd = mm_receive_fd(monitor->m_recvfd);
 
 	/* Success */
 	return (1);
@@ -641,7 +628,7 @@
 		return;
 	buffer_init(&m);
 	buffer_put_cstring(&m, s->tty);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTYCLEANUP, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_PTYCLEANUP, &m);
 	buffer_free(&m);
 
 	/* closed dup'ed master */
@@ -660,7 +647,7 @@
 	Buffer m;
 
 	buffer_init(&m);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_TERM, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_TERM, &m);
 	buffer_free(&m);
 }
 
@@ -672,9 +659,9 @@
 
 	buffer_init(&m);
 	buffer_put_bignum2(&m, num);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SESSKEY, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_SESSKEY, &m);
 
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SESSKEY, &m);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_SESSKEY, &m);
 
 	rsafail = buffer_get_int(&m);
 	buffer_get_bignum2(&m, num);
@@ -688,10 +675,10 @@
 mm_chall_setup(char **name, char **infotxt, u_int *numprompts,
     char ***prompts, u_int **echo_on)
 {
-	*name = xstrdup("");
-	*infotxt = xstrdup("");
+	*name       = xstrdup("");
+	*infotxt    = xstrdup("");
 	*numprompts = 1;
-	*prompts = xmalloc(*numprompts * sizeof(char *));
+	*prompts = xmalloc(*numprompts * sizeof(char*));
 	*echo_on = xmalloc(*numprompts * sizeof(u_int));
 	(*echo_on)[0] = 0;
 }
@@ -701,19 +688,19 @@
    u_int *numprompts, char ***prompts, u_int **echo_on)
 {
 	Buffer m;
-	u_int success;
+	int res;
 	char *challenge;
 
-	debug3("%s: entering", __func__);
+	debug3("%s: entering", __FUNCTION__);
 
 	buffer_init(&m);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHQUERY, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_BSDAUTHQUERY, &m);
 
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_BSDAUTHQUERY,
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_BSDAUTHQUERY,
 	    &m);
-	success = buffer_get_int(&m);
-	if (success == 0) {
-		debug3("%s: no challenge", __func__);
+	res = buffer_get_int(&m);
+	if (res == -1) {
+		debug3("%s: no challenge", __FUNCTION__);
 		buffer_free(&m);
 		return (-1);
 	}
@@ -725,7 +712,7 @@
 	mm_chall_setup(name, infotxt, numprompts, prompts, echo_on);
 	(*prompts)[0] = challenge;
 
-	debug3("%s: received challenge: %s", __func__, challenge);
+	debug3("%s: received challenge: %s", __FUNCTION__, challenge);
 
 	return (0);
 }
@@ -736,15 +723,15 @@
 	Buffer m;
 	int authok;
 
-	debug3("%s: entering", __func__);
+	debug3("%s: entering", __FUNCTION__);
 	if (numresponses != 1)
 		return (-1);
 
 	buffer_init(&m);
 	buffer_put_cstring(&m, responses[0]);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHRESPOND, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_BSDAUTHRESPOND, &m);
 
-	mm_request_receive_expect(pmonitor->m_recvfd,
+	mm_request_receive_expect(monitor->m_recvfd,
 	    MONITOR_ANS_BSDAUTHRESPOND, &m);
 
 	authok = buffer_get_int(&m);
@@ -758,20 +745,19 @@
    u_int *numprompts, char ***prompts, u_int **echo_on)
 {
 	Buffer m;
-	int len;
-	u_int success;
+	int len, res;
 	char *p, *challenge;
 
-	debug3("%s: entering", __func__);
+	debug3("%s: entering", __FUNCTION__);
 
 	buffer_init(&m);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SKEYQUERY, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_SKEYQUERY, &m);
 
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SKEYQUERY,
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_SKEYQUERY,
 	    &m);
-	success = buffer_get_int(&m);
-	if (success == 0) {
-		debug3("%s: no challenge", __func__);
+	res = buffer_get_int(&m);
+	if (res == -1) {
+		debug3("%s: no challenge", __FUNCTION__);
 		buffer_free(&m);
 		return (-1);
 	}
@@ -780,7 +766,7 @@
 	challenge  = buffer_get_string(&m, NULL);
 	buffer_free(&m);
 
-	debug3("%s: received challenge: %s", __func__, challenge);
+	debug3("%s: received challenge: %s", __FUNCTION__, challenge);
 
 	mm_chall_setup(name, infotxt, numprompts, prompts, echo_on);
 
@@ -800,15 +786,15 @@
 	Buffer m;
 	int authok;
 
-	debug3("%s: entering", __func__);
+	debug3("%s: entering", __FUNCTION__);
 	if (numresponses != 1)
 		return (-1);
 
 	buffer_init(&m);
 	buffer_put_cstring(&m, responses[0]);
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SKEYRESPOND, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_SKEYRESPOND, &m);
 
-	mm_request_receive_expect(pmonitor->m_recvfd,
+	mm_request_receive_expect(monitor->m_recvfd,
 	    MONITOR_ANS_SKEYRESPOND, &m);
 
 	authok = buffer_get_int(&m);
@@ -823,13 +809,13 @@
 	Buffer m;
 	int i;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	buffer_init(&m);
 	for (i = 0; i < 16; i++)
 		buffer_put_char(&m, session_id[i]);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SESSID, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_SESSID, &m);
 	buffer_free(&m);
 }
 
@@ -840,27 +826,22 @@
 	Key *key;
 	u_char *blob;
 	u_int blen;
-	int allowed = 0, have_forced = 0;
+	int allowed = 0;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	buffer_init(&m);
 	buffer_put_bignum2(&m, client_n);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_RSAKEYALLOWED, &m);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_RSAKEYALLOWED, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_RSAKEYALLOWED, &m);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_RSAKEYALLOWED, &m);
 
 	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)
-			fatal("%s: key_from_blob failed", __func__);
+			fatal("%s: key_from_blob failed", __FUNCTION__);
 		*rkey = key;
 		xfree(blob);
 	}
@@ -878,22 +859,22 @@
 	u_char *blob;
 	u_int blen;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	if ((challenge = BN_new()) == NULL)
-		fatal("%s: BN_new failed", __func__);
+		fatal("%s: BN_new failed", __FUNCTION__);
 
 	key->type = KEY_RSA;    /* XXX cheat for key_to_blob */
 	if (key_to_blob(key, &blob, &blen) == 0)
-		fatal("%s: key_to_blob failed", __func__);
+		fatal("%s: key_to_blob failed", __FUNCTION__);
 	key->type = KEY_RSA1;
 
 	buffer_init(&m);
 	buffer_put_string(&m, blob, blen);
 	xfree(blob);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_RSACHALLENGE, &m);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_RSACHALLENGE, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_RSACHALLENGE, &m);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_RSACHALLENGE, &m);
 
 	buffer_get_bignum2(&m, challenge);
 	buffer_free(&m);
@@ -909,11 +890,11 @@
 	u_int blen;
 	int success = 0;
 
-	debug3("%s entering", __func__);
+	debug3("%s entering", __FUNCTION__);
 
 	key->type = KEY_RSA;    /* XXX cheat for key_to_blob */
 	if (key_to_blob(key, &blob, &blen) == 0)
-		fatal("%s: key_to_blob failed", __func__);
+		fatal("%s: key_to_blob failed", __FUNCTION__);
 	key->type = KEY_RSA1;
 
 	buffer_init(&m);
@@ -921,82 +902,11 @@
 	buffer_put_string(&m, response, 16);
 	xfree(blob);
 
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_RSARESPONSE, &m);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_RSARESPONSE, &m);
+	mm_request_send(monitor->m_recvfd, MONITOR_REQ_RSARESPONSE, &m);
+	mm_request_receive_expect(monitor->m_recvfd, MONITOR_ANS_RSARESPONSE, &m);
 
 	success = buffer_get_int(&m);
 	buffer_free(&m);
 
 	return (success);
 }
-
-#ifdef KRB4
-int
-mm_auth_krb4(Authctxt *authctxt, void *_auth, char **client, void *_reply)
-{
-	KTEXT auth, reply;
- 	Buffer m;
-	u_int rlen;
-	int success = 0;
-	char *p;
-
-	debug3("%s entering", __func__);
-	auth = _auth;
-	reply = _reply;
-
-	buffer_init(&m);
-	buffer_put_string(&m, auth->dat, auth->length);
-
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KRB4, &m);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KRB4, &m);
-
-	success = buffer_get_int(&m);
-	if (success) {
-		*client = buffer_get_string(&m, NULL);
-		p = buffer_get_string(&m, &rlen);
-		if (rlen >= MAX_KTXT_LEN)
-			fatal("%s: reply from monitor too large", __func__);
-		reply->length = rlen;
-		memcpy(reply->dat, p, rlen);
-		memset(p, 0, rlen);
-		xfree(p);
-	}
-	buffer_free(&m);
-	return (success);
-}
-#endif
-
-#ifdef KRB5
-int
-mm_auth_krb5(void *ctx, void *argp, char **userp, void *resp)
-{
-	krb5_data *tkt, *reply;
-	Buffer m;
-	int success;
-
-	debug3("%s entering", __func__);
-	tkt = (krb5_data *) argp;
-	reply = (krb5_data *) resp;
-
-	buffer_init(&m);
-	buffer_put_string(&m, tkt->data, tkt->length);
-
-	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KRB5, &m);
-	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KRB5, &m);
-
-	success = buffer_get_int(&m);
-	if (success) {
-		u_int len;
-
-		*userp = buffer_get_string(&m, NULL);
-		reply->data = buffer_get_string(&m, &len);
-		reply->length = len;
-	} else {
-		memset(reply, 0, sizeof(*reply));
-		*userp = NULL;
-	}
-
-	buffer_free(&m);
-	return (success);
-}
-#endif