projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
create mod_ssl.
[apps/madmutt.git]
/
imap
/
imap.c
diff --git
a/imap/imap.c
b/imap/imap.c
index
43c2426
..
a6bbfb3
100644
(file)
--- a/
imap/imap.c
+++ b/
imap/imap.c
@@
-381,16
+381,13
@@
int imap_open_connection (IMAP_DATA * idata)
if (imap_check_capabilities (idata))
goto bail;
/* Attempt STARTTLS if available and desired. */
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;
mutt_bit_isset (idata->capabilities, STARTTLS))) {
int rc;
- if (
option (OPTSSLFORCETLS)
)
+ if (
mod_ssl.force_tls
)
rc = M_YES;
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 ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
goto bail;
if (rc != -2) {
@@
-409,7
+406,7
@@
int imap_open_connection (IMAP_DATA * idata)
}
}
}
}
- 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;
mutt_error _("Encrypted connection unavailable");
mutt_sleep (1);
goto err_close_conn;