upstream commit

move dispatch to struct ssh; ok djm@

1 files changed, 7 insertions, 5 deletions

diff --git a/auth2.c b/auth2.c
index 93e355ff6..717796228 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.134 2014/12/22 07:55:51 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.135 2015/01/19 20:07:45 markus Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -87,8 +87,8 @@ Authmethod *authmethods[] = {
 
 /* protocol */
 
-static void input_service_request(int, u_int32_t, void *);
-static void input_userauth_request(int, u_int32_t, void *);
+static int input_service_request(int, u_int32_t, void *);
+static int input_userauth_request(int, u_int32_t, void *);
 
 /* helper */
 static Authmethod *authmethod_lookup(Authctxt *, const char *);
@@ -174,7 +174,7 @@ do_authentication2(Authctxt *authctxt)
 }
 
 /*ARGSUSED*/
-static void
+static int
 input_service_request(int type, u_int32_t seq, void *ctxt)
 {
         Authctxt *authctxt = ctxt;
@@ -205,10 +205,11 @@ input_service_request(int type, u_int32_t seq, void *ctxt)
                 packet_disconnect("bad service request %s", service);
         }
         free(service);
+        return 0;
 }
 
 /*ARGSUSED*/
-static void
+static int
 input_userauth_request(int type, u_int32_t seq, void *ctxt)
 {
         Authctxt *authctxt = ctxt;
@@ -284,6 +285,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
         free(service);
         free(user);
         free(method);
+        return 0;
 }
 
 void