merge of abac2150ee4f4031a98016241fbd136d24fed127

     and ffa047425729e478a5b49b1ab0f8ec71c08a1421

--HG--
extra : convert_revision : e9b7d4eda64d70aff736f48cc8dea680b153139b

1 files changed, 5 insertions, 1 deletions

diff --git a/common-session.c b/common-session.c
index fce301a..b7793f9 100644
--- a/common-session.c
+++ b/common-session.c
@@ -76,7 +76,7 @@ void common_session_init(int sock, runopts *opts) {
 	ses.payload = NULL;
 	ses.recvseq = 0;
 
-	ses.expecting = SSH_MSG_KEXINIT;
+	ses.requirenext = SSH_MSG_KEXINIT;
 	ses.dataallowed = 0; /* don't send data yet, we'll wait until after kex */
 	ses.ignorenext = 0;
 
@@ -106,8 +106,12 @@ void common_session_init(int sock, runopts *opts) {
 	ses.dh_K = NULL;
 	ses.remoteident = NULL;
 
+	ses.authdone = 0;
+
 	ses.chantypes = NULL;
 
+	ses.allowprivport = 0;
+
 
 	TRACE(("leave session_init"));
 }