Rocco Rutte:
- fix the underlying problem of the str_dup()-issue for IMAP
- fix imap_login overwriting imap_user as documented
git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@800
e385b8ad-14ed-0310-8656-
cc95a2468c6d
#ifdef USE_IMAP
if (a1->type == M_ACCT_TYPE_IMAP) {
#ifdef USE_IMAP
if (a1->type == M_ACCT_TYPE_IMAP) {
+ if (ImapUser && (ImapUser[0] != '\0'))
+ if (ImapLogin && (ImapLogin[0] != '\0'))
login = ImapLogin;
}
#endif
login = ImapLogin;
}
#endif
if (account->flags & M_ACCT_USER)
return 0;
#ifdef USE_IMAP
if (account->flags & M_ACCT_USER)
return 0;
#ifdef USE_IMAP
- else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser)
+ else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser && (ImapUser[0] != '\0'))
strfcpy (account->user, ImapUser, sizeof (account->user));
#endif
#ifdef USE_POP
strfcpy (account->user, ImapUser, sizeof (account->user));
#endif
#ifdef USE_POP
#ifdef USE_IMAP
else if (account->type == M_ACCT_TYPE_IMAP)
{
#ifdef USE_IMAP
else if (account->type == M_ACCT_TYPE_IMAP)
{
+ if (ImapLogin && (ImapLogin[0] != '\0')) {
strfcpy (account->login, ImapLogin, sizeof (account->login));
account->flags |= M_ACCT_LOGIN;
}
strfcpy (account->login, ImapLogin, sizeof (account->login));
account->flags |= M_ACCT_LOGIN;
}
mutt_message _("Logging in...");
mutt_message _("Logging in...");
- imap_quote_string (q_user, sizeof (q_user), idata->conn->account.user);
+ imap_quote_string (q_user, sizeof (q_user), idata->conn->account.login);
imap_quote_string (q_pass, sizeof (q_pass), idata->conn->account.pass);
#ifdef DEBUG
imap_quote_string (q_pass, sizeof (q_pass), idata->conn->account.pass);
#ifdef DEBUG