if (imap_check_capabilities (idata))
goto bail;
/* Attempt STARTTLS if available and desired. */
- if (!idata->conn->ssf && (option(OPTSSLFORCETLS) ||
+ if (!idata->conn->ssf && (mod_ssl.force_tls ||
mutt_bit_isset (idata->capabilities, STARTTLS))) {
int rc;
- if (option (OPTSSLFORCETLS))
+ if (mod_ssl.force_tls)
rc = M_YES;
- else if ((rc = query_quadoption (OPT_SSLSTARTTLS,
- _("Secure connection with TLS?"))) == -1)
- goto err_close_conn;
- if (rc == M_YES) {
+ else if (mod_ssl.starttls) {
if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
goto bail;
if (rc != -2) {
}
}
- if (option(OPTSSLFORCETLS) && ! idata->conn->ssf) {
+ if (mod_ssl.force_tls && ! idata->conn->ssf) {
mutt_error _("Encrypted connection unavailable");
mutt_sleep (1);
goto err_close_conn;