From dbb339f015c33d63484261d140c84ad875a9e548 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sun, 19 Dec 2021 22:12:07 +0000 Subject: upstream: prepare for multiple names for authmethods allow authentication methods to have one additional name beyond their primary name. allow lookup by this synonym Use primary name for authentication decisions, e.g. for PermitRootLogin=publickey Pass actual invoked name to the authmethods, so they can tell whether they were requested via the their primary name or synonym. ok markus@ OpenBSD-Commit-ID: 9e613fcb44b8168823195602ed3d09ffd7994559 --- auth2-kbdint.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'auth2-kbdint.c') diff --git a/auth2-kbdint.c b/auth2-kbdint.c index 037139d4..ae7eca3b 100644 --- a/auth2-kbdint.c +++ b/auth2-kbdint.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-kbdint.c,v 1.13 2021/07/02 05:11:20 dtucker Exp $ */ +/* $OpenBSD: auth2-kbdint.c,v 1.14 2021/12/19 22:12:07 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -44,7 +44,7 @@ extern ServerOptions options; static int -userauth_kbdint(struct ssh *ssh) +userauth_kbdint(struct ssh *ssh, const char *method) { int r, authenticated = 0; char *lang, *devs; @@ -66,6 +66,7 @@ userauth_kbdint(struct ssh *ssh) Authmethod method_kbdint = { "keyboard-interactive", + NULL, userauth_kbdint, &options.kbd_interactive_authentication }; -- cgit v1.2.1