|
Lines 773-778
Link Here
|
| 773 |
return PAM_SERVICE_ERR; |
773 |
return PAM_SERVICE_ERR; |
| 774 |
} |
774 |
} |
| 775 |
|
775 |
|
|
|
776 |
#if 0 |
| 776 |
/* Look up the password */ |
777 |
/* Look up the password */ |
| 777 |
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password); |
778 |
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password); |
| 778 |
if (ret != PAM_SUCCESS || password == NULL) { |
779 |
if (ret != PAM_SUCCESS || password == NULL) { |
|
Lines 783-788
Link Here
|
| 783 |
pam_strerror (ph, ret)); |
784 |
pam_strerror (ph, ret)); |
| 784 |
return PAM_SUCCESS; |
785 |
return PAM_SUCCESS; |
| 785 |
} |
786 |
} |
|
|
787 |
#else |
| 788 |
/* Look up the password */ |
| 789 |
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password); |
| 790 |
if (ret != PAM_SUCCESS || password == NULL) { |
| 791 |
ret = prompt_password (ph); |
| 792 |
if (ret != PAM_SUCCESS) { |
| 793 |
syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the password from user: %s", |
| 794 |
pam_strerror (ph, ret)); |
| 795 |
return PAM_AUTH_ERR; |
| 796 |
} |
| 797 |
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password); |
| 798 |
if (ret != PAM_SUCCESS || password == NULL) { |
| 799 |
syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the password from user: %s", |
| 800 |
ret == PAM_SUCCESS ? "password was null" : pam_strerror (ph, ret)); |
| 801 |
return PAM_AUTHTOK_RECOVER_ERR; |
| 802 |
} |
| 803 |
} |
| 804 |
#endif |
| 786 |
|
805 |
|
| 787 |
started_daemon = 0; |
806 |
started_daemon = 0; |
| 788 |
|
807 |
|
