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]
/
pop
/
pop_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
f6587ef
..
693259d
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-244,16
+244,12
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
}
/* Attempt STLS if available and desired. */
}
/* Attempt STLS if available and desired. */
- if (!pop_data->conn->ssf && (pop_data->cmd_stls ||
option(OPTSSLFORCETLS)
)) {
- if (
option (OPTSSLFORCETLS)
)
+ if (!pop_data->conn->ssf && (pop_data->cmd_stls ||
mod_ssl.force_tls
)) {
+ if (
mod_ssl.force_tls
)
pop_data->use_stls = 2;
if (pop_data->use_stls == 0) {
pop_data->use_stls = 2;
if (pop_data->use_stls == 0) {
- ret = query_quadoption (OPT_SSLSTARTTLS,
- _("Secure connection with TLS?"));
- if (ret == -1)
- return PQ_ERR;
pop_data->use_stls = 1;
pop_data->use_stls = 1;
- if (
ret == M_YES
)
+ if (
mod_ssl.starttls
)
pop_data->use_stls = 2;
}
if (pop_data->use_stls == 2) {
pop_data->use_stls = 2;
}
if (pop_data->use_stls == 2) {
@@
-284,7
+280,7
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
}
}
}
}
- if (
option(OPTSSLFORCETLS)
&& !pop_data->conn->ssf) {
+ if (
mod_ssl.force_tls
&& !pop_data->conn->ssf) {
mutt_error _("Encrypted connection unavailable");
mutt_sleep (1);
return -2;
mutt_error _("Encrypted connection unavailable");
mutt_sleep (1);
return -2;