merge of abac2150ee4f4031a98016241fbd136d24fed127

     and ffa047425729e478a5b49b1ab0f8ec71c08a1421

--HG--
extra : convert_revision : e9b7d4eda64d70aff736f48cc8dea680b153139b

1 files changed, 7 insertions, 3 deletions

diff --git a/svr-auth.c b/svr-auth.c
index f6adb05..386c3e1 100644
--- a/svr-auth.c
+++ b/svr-auth.c
@@ -52,7 +52,7 @@ void authinitialise() {
  * on initialisation */
 static void authclear() {
 	
-	svr_ses.authstate.authdone = 0;
+	ses.authdone = 0;
 	svr_ses.authstate.pw = NULL;
 	svr_ses.authstate.username = NULL;
 	svr_ses.authstate.printableuser = NULL;
@@ -102,7 +102,7 @@ void recv_msg_userauth_request() {
 	TRACE(("enter recv_msg_userauth_request"));
 
 	/* ignore packets if auth is already done */
-	if (svr_ses.authstate.authdone == 1) {
+	if (ses.authdone == 1) {
 		return;
 	}
 
@@ -339,7 +339,11 @@ void send_msg_userauth_success() {
 	buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_SUCCESS);
 	encrypt_packet();
 
-	svr_ses.authstate.authdone = 1;
+	ses.authdone = 1;
+
+	if (svr_ses.authstate.pw->pw_uid == 0) {
+		ses.allowprivport = 1;
+	}
 
 	/* Remove from the list of pre-auth sockets. Should be m_close(), since if
 	 * we fail, we might end up leaking connection slots, and disallow new