diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2015-07-26 08:29:05 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2015-07-26 08:29:05 -0600 |
| commit | 7c946bfafe961c1dda51d19b5c29a5600ef1e5ec (patch) | |
| tree | 608ff1bdeafce3223747418560cb39e045a5683f /imap/src/osdep/unix/ckp_pam.c | |
| parent | 9306e227fc7b1b096d4a58f8c06da66603a50a6a (diff) | |
| download | alpine-7c946bfafe961c1dda51d19b5c29a5600ef1e5ec.tar.xz | |
* Fix compilation error in arg.c when pwdcertdir was being freed, even
though a password file might have not been defined.
* Work on reducing the number of warnings in OSX.
Diffstat (limited to 'imap/src/osdep/unix/ckp_pam.c')
| -rw-r--r-- | imap/src/osdep/unix/ckp_pam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/imap/src/osdep/unix/ckp_pam.c b/imap/src/osdep/unix/ckp_pam.c index 60c6c1f7..5bc31f3d 100644 --- a/imap/src/osdep/unix/ckp_pam.c +++ b/imap/src/osdep/unix/ckp_pam.c @@ -104,13 +104,13 @@ struct passwd *checkpw (struct passwd *pw,char *pass,int argc,char *argv[]) conv.appdata_ptr = &cred; cred.uname = name; cred.pass = pass; - if (pw = ((pam_start ((char *) mail_parameters (NIL,GET_SERVICENAME,NIL), + if ((pw = ((pam_start ((char *) mail_parameters (NIL,GET_SERVICENAME,NIL), pw->pw_name,&conv,&hdl) == PAM_SUCCESS) && (pam_set_item (hdl,PAM_RHOST,tcp_clientaddr ()) == PAM_SUCCESS) && (pam_authenticate (hdl,NIL) == PAM_SUCCESS) && (pam_acct_mgmt (hdl,NIL) == PAM_SUCCESS) && (pam_setcred (hdl,PAM_ESTABLISH_CRED) == PAM_SUCCESS)) ? - getpwnam (name) : NIL) { + getpwnam (name) : NIL) != NULL) { #if 0 /* * Some people have reported that this causes a SEGV in strncpy() from |