ac_prefs->smtp_server, "smtp", port,
&(smtp_session->pass))) {
/* NOP */;
- } else if (ac_prefs->smtp_passwd)
- smtp_session->pass =
+ } else if ((smtp_session->pass =
passwd_store_get(PWS_ACCOUNT, ac_prefs->account_name,
- PWS_ACCOUNT_SEND);
- else {
+ PWS_ACCOUNT_SEND)) == NULL) {
smtp_session->pass =
input_dialog_query_password_keep
(ac_prefs->smtp_server,
ac_prefs->smtp_server, "smtp", port,
&(smtp_session->pass))) {
/* NOP */;
- } else if (ac_prefs->passwd)
- smtp_session->pass = passwd_store_get(PWS_ACCOUNT,
- ac_prefs->account_name, PWS_ACCOUNT_RECV);
- else {
+ } else if ((smtp_session->pass = passwd_store_get(PWS_ACCOUNT,
+ ac_prefs->account_name, PWS_ACCOUNT_RECV)) == NULL) {
smtp_session->pass =
input_dialog_query_password_keep
(ac_prefs->smtp_server,