diff options
| author | Guilhem Moulin <guilhem@debian.org> | 2020-06-26 20:56:03 +0800 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@debian.org> | 2020-06-26 20:56:03 +0800 |
| commit | eaf9be05d7d9de22f2ff936882874331fc2d1a0e (patch) | |
| tree | 1135b1b104345221b1c116a0cb12c6f2699078d5 | |
| parent | ef7c9fd37768015e46cf55517c3d506b68e428c7 (diff) | |
| download | dropbear-eaf9be05d7d9de22f2ff936882874331fc2d1a0e.tar.gz | |
Don't choke on disabled authorized_keys(5) options
As of 2020.79 X11 forwarding is disabled at build time, which could lock
out users with authorized_keys(5) files containing ?no-X11-forwarding?
options.
| -rw-r--r-- | svr-authpubkeyoptions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svr-authpubkeyoptions.c b/svr-authpubkeyoptions.c index 9bdad15..4f0c943 100644 --- a/svr-authpubkeyoptions.c +++ b/svr-authpubkeyoptions.c @@ -147,20 +147,20 @@ int svr_add_pubkey_options(buffer *options_buf, int line_num, const char* filena ses.authstate.pubkey_options->no_port_forwarding_flag = 1; goto next_option; } -#if DROPBEAR_SVR_AGENTFWD if (match_option(options_buf, "no-agent-forwarding") == DROPBEAR_SUCCESS) { +#if DROPBEAR_SVR_AGENTFWD dropbear_log(LOG_WARNING, "Agent forwarding disabled."); ses.authstate.pubkey_options->no_agent_forwarding_flag = 1; +#endif goto next_option; } -#endif -#if DROPBEAR_X11FWD if (match_option(options_buf, "no-X11-forwarding") == DROPBEAR_SUCCESS) { +#if DROPBEAR_X11FWD dropbear_log(LOG_WARNING, "X11 forwarding disabled."); ses.authstate.pubkey_options->no_x11_forwarding_flag = 1; +#endif goto next_option; } -#endif if (match_option(options_buf, "no-pty") == DROPBEAR_SUCCESS) { dropbear_log(LOG_WARNING, "Pty allocation disabled."); ses.authstate.pubkey_options->no_pty_flag = 1; |