diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2024-05-17 02:30:23 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-05-17 06:41:35 +0200 |
| commit | 03e3de416ed7c34faeb692967737be4a7bbe2eb5 (patch) | |
| tree | 6794217dbc0a1369e9d6e1b0a9f40534596a6648 /auth2-kbdint.c | |
| parent | upstream: simplify exit message handling, which was more complicated (diff) | |
| download | openssh-03e3de416ed7c34faeb692967737be4a7bbe2eb5.tar.xz openssh-03e3de416ed7c34faeb692967737be4a7bbe2eb5.zip | |
upstream: Start the process of splitting sshd into separate
binaries. This step splits sshd into a listener and a session binary. More
splits are planned.
After this changes, the listener binary will validate the configuration,
load the hostkeys, listen on port 22 and manage MaxStartups only. All
session handling will be performed by a new sshd-session binary that the
listener fork+execs.
This reduces the listener process to the minimum necessary and sets us
up for future work on the sshd-session binary.
feedback/ok markus@ deraadt@
NB. if you're updating via source, please restart sshd after installing,
otherwise you run the risk of locking yourself out.
OpenBSD-Commit-ID: 43c04a1ab96cdbdeb53d2df0125a6d42c5f19934
Diffstat (limited to 'auth2-kbdint.c')
| -rw-r--r-- | auth2-kbdint.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/auth2-kbdint.c b/auth2-kbdint.c index ae7eca3b8..fd08e720d 100644 --- a/auth2-kbdint.c +++ b/auth2-kbdint.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-kbdint.c,v 1.14 2021/12/19 22:12:07 djm Exp $ */ +/* $OpenBSD: auth2-kbdint.c,v 1.15 2024/05/17 00:30:23 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -42,6 +42,7 @@ /* import */ extern ServerOptions options; +extern struct authmethod_cfg methodcfg_kbdint; static int userauth_kbdint(struct ssh *ssh, const char *method) @@ -65,8 +66,6 @@ userauth_kbdint(struct ssh *ssh, const char *method) } Authmethod method_kbdint = { - "keyboard-interactive", - NULL, + &methodcfg_kbdint, userauth_kbdint, - &options.kbd_interactive_authentication }; |