diff cli-session.c @ 47:4b53a43f0082

- client pubkey auth works - rearrange the runopts code for client and server (hostkey reading is needed by both (if the client is doing pubkey auth. otherwise....))
author Matt Johnston <matt@ucc.asn.au>
date Fri, 06 Aug 2004 16:18:01 +0000
parents 9ee8996a375f
children 20563735e8b5
line wrap: on
line diff
--- a/cli-session.c	Fri Aug 06 02:51:17 2004 +0000
+++ b/cli-session.c	Fri Aug 06 16:18:01 2004 +0000
@@ -88,6 +88,10 @@
 	cli_ses.tty_raw_mode = 0;
 	cli_ses.winchange = 0;
 
+	/* Auth */
+	cli_ses.lastpubkey = NULL;
+	cli_ses.lastauthtype = NULL;
+
 	/* For printing "remote host closed" for the user */
 	ses.remoteclosed = cli_remoteclosed;
 	ses.buf_match_algo = cli_buf_match_algo;
@@ -160,6 +164,7 @@
 			TRACE(("leave cli_sessionloop: cli_auth_try"));
 			return;
 
+			/*
 		case USERAUTH_SUCCESS_RCVD:
 			send_msg_service_request(SSH_SERVICE_CONNECTION);
 			cli_ses.state = SERVICE_CONN_REQ_SENT;
@@ -171,14 +176,13 @@
 			TRACE(("leave cli_sessionloop: cli_send_chansess_request"));
 			cli_ses.state = SESSION_RUNNING;
 			return;
+			*/
 
-			/*
 		case USERAUTH_SUCCESS_RCVD:
 			cli_send_chansess_request();
 			TRACE(("leave cli_sessionloop: cli_send_chansess_request"));
 			cli_ses.state = SESSION_RUNNING;
 			return;
-			*/
 
 		case SESSION_RUNNING:
 			if (ses.chancount < 1) {
@@ -236,7 +240,7 @@
 void cleantext(unsigned char* dirtytext) {
 
 	unsigned int i, j;
-	unsigned char c, lastchar;
+	unsigned char c;
 
 	j = 0;
 	for (i = 0; dirtytext[i] != '\0'; i++) {