* mailboxes command ;-((( FIXME
*/
buf[0] = '\0';
- snprintf (buf, sizeof (buf), "nntp%s://%s%s%s%s/%s",
- (data->nserv->conn->account.flags & M_ACCT_SSL) ? "s" : "",
- NONULL (data->nserv->conn->account.user),
- *data->nserv->conn->account.pass ? ":" : "",
- *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
- data->nserv->conn->account.host,
- data->group);
+ snprintf(buf, sizeof (buf), "nntp%s://%s%s%s%s/%s",
+ data->nserv->conn->account.has_ssl ? "s" : "",
+ NONULL(data->nserv->conn->account.user),
+ *data->nserv->conn->account.pass ? ":" : "",
+ *data->nserv->conn->account.pass ? data->nserv->conn->account.pass : "",
+ data->nserv->conn->account.host,
+ data->group);
/* bail out if group not found via mailboxes */
if ((i = buffy_lookup (buf)) < 0)
char buf[STRING];
unsigned char flags = conn->account.flags;
- if (mutt_account_getuser (&conn->account) || !conn->account.user[0] ||
- mutt_account_getpass (&conn->account) || !conn->account.pass[0]) {
+ if (mutt_account_getuser(&conn->account) || !conn->account.user[0] ||
+ mutt_account_getpass(&conn->account) || !conn->account.pass[0]) {
conn->account.flags = flags;
return -2;
}
if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
return nntp_connect_error (serv);
- if (!(conn->account.flags & M_ACCT_USER) && m_strncmp("480", buf, 3)) {
+ if (!conn->account.has_user && m_strncmp("480", buf, 3)) {
serv->status = NNTP_OK;
return 0;
}
int ret;
HEADER *h = ctx->hdrs[ctx->msgcount];
- f = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+ f = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
if (!f)
return -1;
p_delete(&cache->path);
cache->index = ctx->hdrs[msgno]->index;
- msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
+ msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL);
if (!msg->fp) {
return -1;
}