From 32a28d0d9cf7c567671366d6ec71df87627e2c49 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Wed, 4 May 2016 15:33:40 +0200 Subject: Convert #ifdef to #if, other build changes --- svr-auth.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'svr-auth.c') diff --git a/svr-auth.c b/svr-auth.c index 577ea88..4dc280c 100644 --- a/svr-auth.c +++ b/svr-auth.c @@ -56,10 +56,10 @@ void svr_authinitialise() { static void authclear() { memset(&ses.authstate, 0, sizeof(ses.authstate)); -#ifdef ENABLE_SVR_PUBKEY_AUTH +#if DROPBEAR_SVR_PUBKEY_AUTH ses.authstate.authtypes |= AUTH_TYPE_PUBKEY; #endif -#if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH) +#if DROPBEAR_SVR_PASSWORD_AUTH || DROPBEAR_SVR_PAM_AUTH if (!svr_opts.noauthpass) { ses.authstate.authtypes |= AUTH_TYPE_PASSWORD; } @@ -169,7 +169,7 @@ void recv_msg_userauth_request() { } } -#ifdef ENABLE_SVR_PASSWORD_AUTH +#if DROPBEAR_SVR_PASSWORD_AUTH if (!svr_opts.noauthpass && !(svr_opts.norootpass && ses.authstate.pw_uid == 0) ) { /* user wants to try password auth */ @@ -184,7 +184,7 @@ void recv_msg_userauth_request() { } #endif -#ifdef ENABLE_SVR_PAM_AUTH +#if DROPBEAR_SVR_PAM_AUTH if (!svr_opts.noauthpass && !(svr_opts.norootpass && ses.authstate.pw_uid == 0) ) { /* user wants to try password auth */ @@ -199,7 +199,7 @@ void recv_msg_userauth_request() { } #endif -#ifdef ENABLE_SVR_PUBKEY_AUTH +#if DROPBEAR_SVR_PUBKEY_AUTH /* user wants to try pubkey auth */ if (methodlen == AUTH_METHOD_PUBKEY_LEN && strncmp(methodname, AUTH_METHOD_PUBKEY, -- cgit v1.2.3