===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/monitor_wrap.c,v
retrieving revision 1.35.2.1
retrieving revision 1.36
diff -u -r1.35.2.1 -r1.36
--- src/usr.bin/ssh/monitor_wrap.c	2004/08/19 04:13:26	1.35.2.1
+++ src/usr.bin/ssh/monitor_wrap.c	2004/06/21 17:36:31	1.36
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.35.2.1 2004/08/19 04:13:26 brad Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.36 2004/06/21 17:36:31 avsm Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -63,7 +63,6 @@
 extern z_stream outgoing_stream;
 extern struct monitor *pmonitor;
 extern Buffer input, output;
-extern Buffer loginmsg;
 
 int
 mm_is_monitor(void)
@@ -187,7 +186,7 @@
 }
 
 struct passwd *
-mm_getpwnamallow(const char *username)
+mm_getpwnamallow(const char *login)
 {
 	Buffer m;
 	struct passwd *pw;
@@ -196,7 +195,7 @@
 	debug3("%s entering", __func__);
 
 	buffer_init(&m);
-	buffer_put_cstring(&m, username);
+	buffer_put_cstring(&m, login);
 
 	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m);
 
@@ -633,7 +632,7 @@
 mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 {
 	Buffer m;
-	char *p, *msg;
+	char *p;
 	int success = 0;
 
 	buffer_init(&m);
@@ -649,15 +648,11 @@
 		return (0);
 	}
 	p = buffer_get_string(&m, NULL);
-	msg = buffer_get_string(&m, NULL);
 	buffer_free(&m);
 
 	strlcpy(namebuf, p, namebuflen); /* Possible truncation */
 	xfree(p);
 
-	buffer_append(&loginmsg, msg, strlen(msg));
-	xfree(msg);
-
 	*ptyfd = mm_receive_fd(pmonitor->m_recvfd);
 	*ttyfd = mm_receive_fd(pmonitor->m_recvfd);
 
@@ -786,7 +781,6 @@
 	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)
@@ -850,7 +844,6 @@
 
 	return ((authok == 0) ? -1 : 0);
 }
-#endif /* SKEY */
 
 void
 mm_ssh1_session_id(u_char session_id[16])