diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2004-09-12 05:52:36 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2004-09-12 05:52:36 +0000 |
| commit | fa26b59b0c45aa34586a00718f14cc44bd94e513 (patch) | |
| tree | 43d1b8a2e0ec17756ae06cf41c4ef7819becb72e /svr-auth.c | |
| parent | c23ffe4bc1bb26f9c3773d55715910a901f3a614 (diff) | |
propagate of 08347df3bca787bd3621602fe2b466c85c9dc3e2 and 717950f4061f1123659ee87c7c168805af920ab7 from branch 'matt.dbclient.rez' to 'matt.dbclient.authpam'
--HG--
branch : private-rez
extra : convert_revision : 555c429bf4e557ea5fd0af9db3987166d8217d8b
Diffstat (limited to 'svr-auth.c')
| -rw-r--r-- | svr-auth.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -55,8 +55,7 @@ static void authclear() { #ifdef ENABLE_SVR_PUBKEY_AUTH ses.authstate.authtypes |= AUTH_TYPE_PUBKEY; #endif -#if defined(DROPBEAR_PASSWORD_AUTH) || defined(DROPBEAR_PAM_AUTH) -#ifdef ENABLE_SVR_PASSWORD_AUTH +#if defined(ENABLE_SVR_PUBKEY_AUTH) || defined(ENABLE_SVR_PAM_AUTH) if (!svr_opts.noauthpass) { ses.authstate.authtypes |= AUTH_TYPE_PASSWORD; } @@ -155,7 +154,7 @@ void recv_msg_userauth_request() { } #endif -#ifdef DROPBEAR_PAM_AUTH +#ifdef ENABLE_SVR_PAM_AUTH if (!svr_opts.noauthpass && !(svr_opts.norootpass && ses.authstate.pw->pw_uid == 0) ) { /* user wants to try password auth */ |