Mercurial > dropbear
diff svr-auth.c @ 119:3394a7cb30cd private-rez
propagate of 08347df3bca787bd3621602fe2b466c85c9dc3e2 and 717950f4061f1123659ee87c7c168805af920ab7 from branch 'matt.dbclient.rez' to 'matt.dbclient.authpam'
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 12 Sep 2004 05:52:36 +0000 |
| parents | 5312ca05ed48 |
| children | 9337c9f9a607 |
line wrap: on
line diff
--- a/svr-auth.c Sun Sep 12 04:56:50 2004 +0000 +++ b/svr-auth.c Sun Sep 12 05:52:36 2004 +0000 @@ -55,8 +55,7 @@ #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 @@ } #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 */