diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 20:07:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:14:16 +1100 |
| commit | 3fdc88a0def4f86aa88a5846ac079dc964c0546a (patch) | |
| tree | d26470c8ffb49bb4417af2b729d933d6ce3f75f8 /auth2.c | |
| parent | 091c302829210c41e7f57c3f094c7b9c054306f0 (diff) | |
| download | openssh-git-3fdc88a0def4f86aa88a5846ac079dc964c0546a.tar.gz | |
upstream commit
move dispatch to struct ssh; ok djm@
Diffstat (limited to 'auth2.c')
| -rw-r--r-- | auth2.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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 |