commit 3fdc88a0def4f86aa88a5846ac079dc964c0546a
author markus@openbsd.org <markus@openbsd.org> Mon Jan 19 20:07:45 2015 +0000
committer Damien Miller <djm@mindrot.org> Tue Jan 20 09:14:16 2015 +1100
tree d26470c8ffb49bb4417af2b729d933d6ce3f75f8
parent 091c302829210c41e7f57c3f094c7b9c054306f0

upstream commit

move dispatch to struct ssh; ok djm@

auth2.c

diff --git a/auth2.c b/auth2.c
index 93e355f..7177962 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 @@
 
 /* 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 @@
 }
 
 /*ARGSUSED*/
-static void
+static int
 input_service_request(int type, u_int32_t seq, void *ctxt)
 {
 	Authctxt *authctxt = ctxt;
@@ -205,10 +205,11 @@
 		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 @@
 	free(service);
 	free(user);
 	free(method);
+	return 0;
 }
 
 void