# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1426515030 -28800
# Node ID 16379795f80b3aa36b8fe36ae6d29c90a05a1303
# Parent  2fa71c3b2827da1f356e1ea383f3e696ebb1b497
Fix merge again. ses.loop_handler is required for PAM

diff -r 2fa71c3b2827 -r 16379795f80b cli-session.c
--- a/cli-session.c	Mon Mar 16 21:34:05 2015 +0800
+++ b/cli-session.c	Mon Mar 16 22:10:30 2015 +0800
@@ -126,7 +126,7 @@
 
 	send_msg_kexinit();
 
-	session_loop(cli_sessionloop);
+	session_loop();
 
 	/* Not reached */
 
diff -r 2fa71c3b2827 -r 16379795f80b common-session.c
--- a/common-session.c	Mon Mar 16 21:34:05 2015 +0800
+++ b/common-session.c	Mon Mar 16 22:10:30 2015 +0800
@@ -242,8 +242,8 @@
 		}
 
 
-		if (loophandler) {
-			loophandler();
+		if (ses.loop_handler) {
+			ses.loop_handler();
 		}
 
 	} /* for(;;) */
diff -r 2fa71c3b2827 -r 16379795f80b session.h
--- a/session.h	Mon Mar 16 21:34:05 2015 +0800
+++ b/session.h	Mon Mar 16 22:10:30 2015 +0800
@@ -44,7 +44,7 @@
 extern int exitflag;
 
 void common_session_init(int sock_in, int sock_out);
-void session_loop(void(*loophandler)()) ATTRIB_NORETURN;
+void session_loop() ATTRIB_NORETURN;
 void session_cleanup();
 void send_session_identification();
 void send_msg_ignore();
diff -r 2fa71c3b2827 -r 16379795f80b svr-session.c
--- a/svr-session.c	Mon Mar 16 21:34:05 2015 +0800
+++ b/svr-session.c	Mon Mar 16 22:10:30 2015 +0800
@@ -136,6 +136,8 @@
 
 	ses.isserver = 1;
 
+	ses.loop_handler = svr_sessionloop;
+
 	/* We're ready to go now */
 	sessinitdone = 1;
 
@@ -147,7 +149,7 @@
 
 	/* Run the main for loop. NULL is for the dispatcher - only the client
 	 * code makes use of it */
-	session_loop(svr_sessionloop);
+	session_loop();
 
 	/* Not reached */