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-chall.c

diff --git a/auth2-chall.c b/auth2-chall.c
index ea4eb69..ddabe1a 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.41 2014/02/02 03:44:31 djm Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -49,7 +49,7 @@
 
 static int auth2_challenge_start(Authctxt *);
 static int send_userauth_info_request(Authctxt *);
-static void input_userauth_info_response(int, u_int32_t, void *);
+static int input_userauth_info_response(int, u_int32_t, void *);
 
 #ifdef BSD_AUTH
 extern KbdintDevice bsdauth_device;
@@ -279,7 +279,7 @@
 	return 1;
 }
 
-static void
+static int
 input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
 {
 	Authctxt *authctxt = ctxt;
@@ -344,6 +344,7 @@
 	}
 	userauth_finish(authctxt, authenticated, "keyboard-interactive",
 	    devicename);
+	return 0;
 }
 
 void