projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop mod_ssl.starttls setting.
[apps/madmutt.git]
/
imap
/
imap.c
diff --git
a/imap/imap.c
b/imap/imap.c
index
38a633c
..
83bb6da
100644
(file)
--- a/
imap/imap.c
+++ b/
imap/imap.c
@@
-383,17
+383,15
@@
int imap_open_connection (IMAP_DATA * idata)
if (mod_ssl.force_tls)
rc = M_YES;
if (mod_ssl.force_tls)
rc = M_YES;
- else
if (mod_ssl.starttls)
{
+ else {
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) {
- if (mutt_ssl_starttls (idata->conn))
- {
+ if (mutt_ssl_starttls (idata->conn)) {
mutt_error (_("Could not negotiate TLS connection"));
mutt_sleep (1);
goto err_close_conn;
mutt_error (_("Could not negotiate TLS connection"));
mutt_sleep (1);
goto err_close_conn;
- }
- else {
+ } else {
/* RFC 2595 demands we recheck CAPABILITY after TLS completes. */
if (imap_exec (idata, "CAPABILITY", 0))
goto bail;
/* RFC 2595 demands we recheck CAPABILITY after TLS completes. */
if (imap_exec (idata, "CAPABILITY", 0))
goto bail;
@@
-1542,7
+1540,7
@@
int imap_reconnect (CONTEXT * ctx)
return 0;
}
return 0;
}
-int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
+
static
int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
url_scheme_t s;
if (!path || !*path)
return -1;
url_scheme_t s;
if (!path || !*path)
return -1;
@@
-1595,6
+1593,7
@@
mx_t const imap_mx = {
imap_access,
imap_open_mailbox,
imap_open_new_message,
imap_access,
imap_open_mailbox,
imap_open_new_message,
+ imap_fetch_message,
acl_check_imap,
_imap_check_mailbox,
imap_close_mailbox,
acl_check_imap,
_imap_check_mailbox,
imap_close_mailbox,