Mercurial > dropbear
diff svr-authpam.c @ 511:582cb38e4eb5 insecure-nocrypto
propagate from branch 'au.asn.ucc.matt.dropbear' (head cdcc3c729e29544e8b98a408e2dc60e4483dfd2a)
to branch 'au.asn.ucc.matt.dropbear.insecure-nocrypto' (head 0ca38a1cf349f7426ac9de34ebe4c3e3735effab)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 06 Nov 2008 13:16:55 +0000 |
| parents | 4317be8b7cf9 |
| children | d3ea8b9672f0 |
line wrap: on
line diff
--- a/svr-authpam.c Mon Oct 02 06:40:51 2006 +0000 +++ b/svr-authpam.c Thu Nov 06 13:16:55 2008 +0000 @@ -31,14 +31,14 @@ #include "dbutil.h" #include "auth.h" +#ifdef ENABLE_SVR_PAM_AUTH + #if defined(HAVE_SECURITY_PAM_APPL_H) #include <security/pam_appl.h> #elif defined (HAVE_PAM_PAM_APPL_H) #include <pam/pam_appl.h> #endif -#ifdef ENABLE_SVR_PAM_AUTH - struct UserDataS { char* user; char* passwd; @@ -195,7 +195,7 @@ /* used to pass data to the PAM conversation function - don't bother with * strdup() etc since these are touched only by our own conversation * function (above) which takes care of it */ - userData.user = ses.authstate.printableuser; + userData.user = ses.authstate.pw_name; userData.passwd = password; /* Init pam */ @@ -221,7 +221,7 @@ rc, pam_strerror(pamHandlep, rc)); dropbear_log(LOG_WARNING, "bad PAM password attempt for '%s' from %s", - ses.authstate.printableuser, + ses.authstate.pw_name, svr_ses.addrstring); send_msg_userauth_failure(0, 1); goto cleanup; @@ -232,7 +232,7 @@ rc, pam_strerror(pamHandlep, rc)); dropbear_log(LOG_WARNING, "bad PAM password attempt for '%s' from %s", - ses.authstate.printableuser, + ses.authstate.pw_name, svr_ses.addrstring); send_msg_userauth_failure(0, 1); goto cleanup; @@ -240,7 +240,7 @@ /* successful authentication */ dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s", - ses.authstate.printableuser, + ses.authstate.pw_name, svr_ses.addrstring); send_msg_userauth_success();