diff options
author | Matt Johnston <matt@ucc.asn.au> | 2017-05-18 22:59:38 +0800 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2017-05-18 22:59:38 +0800 |
commit | 45b27b0194d3981082128a78e3d7102c190a812a (patch) | |
tree | 6520ac7fb580a0cffd925d0bf9a77d15f6c71a27 /svr-authpubkeyoptions.c | |
parent | 2a921c2c25658425af1ea9a8bf8b9de3f3647aef (diff) | |
parent | 9f674382d55cb3b8effcb53cf8d7c2d368675f3d (diff) |
merge 2017.75
Diffstat (limited to 'svr-authpubkeyoptions.c')
-rw-r--r-- | svr-authpubkeyoptions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svr-authpubkeyoptions.c b/svr-authpubkeyoptions.c index 55b78ba..d08fc2c 100644 --- a/svr-authpubkeyoptions.c +++ b/svr-authpubkeyoptions.c @@ -47,7 +47,7 @@ #include "signkey.h" #include "auth.h" -#ifdef ENABLE_SVR_PUBKEY_OPTIONS +#if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT /* Returns 1 if pubkey allows agent forwarding, * 0 otherwise */ @@ -147,14 +147,14 @@ 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; } -#ifdef ENABLE_SVR_AGENTFWD +#if DROPBEAR_SVR_AGENTFWD if (match_option(options_buf, "no-agent-forwarding") == DROPBEAR_SUCCESS) { dropbear_log(LOG_WARNING, "Agent forwarding disabled."); ses.authstate.pubkey_options->no_agent_forwarding_flag = 1; goto next_option; } #endif -#ifdef ENABLE_X11FWD +#if DROPBEAR_X11FWD if (match_option(options_buf, "no-X11-forwarding") == DROPBEAR_SUCCESS) { dropbear_log(LOG_WARNING, "X11 forwarding disabled."); ses.authstate.pubkey_options->no_x11_forwarding_flag = 1; |