projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop openssl support as well, only use GNUTLS.
[apps/madmutt.git]
/
lib-sys
/
mutt_socket.c
diff --git
a/lib-sys/mutt_socket.c
b/lib-sys/mutt_socket.c
index
fa054ae
..
65ba008
100644
(file)
--- a/
lib-sys/mutt_socket.c
+++ b/
lib-sys/mutt_socket.c
@@
-24,8
+24,10
@@
#include "mutt_socket.h"
#include "mutt_tunnel.h"
#include "mutt_signal.h"
#include "mutt_socket.h"
#include "mutt_tunnel.h"
#include "mutt_signal.h"
-#include "mutt_ssl.h"
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
#include "mutt_idna.h"
/* support for multiple socket connections */
#include "mutt_idna.h"
/* support for multiple socket connections */
@@
-212,21
+214,11
@@
CONNECTION *mutt_conn_find (const CONNECTION * start, const ACCOUNT * account)
if (Tunnel && *Tunnel)
mutt_tunnel_socket_setup (conn);
else if (account->flags & M_ACCT_SSL) {
if (Tunnel && *Tunnel)
mutt_tunnel_socket_setup (conn);
else if (account->flags & M_ACCT_SSL) {
-#if defined (USE_SSL) || defined (USE_GNUTLS)
if (mutt_ssl_socket_setup (conn) < 0) {
mutt_socket_free (conn);
return NULL;
}
if (mutt_ssl_socket_setup (conn) < 0) {
mutt_socket_free (conn);
return NULL;
}
-#else
- mutt_error _("SSL is unavailable.");
-
- mutt_sleep (2);
- mutt_socket_free (conn);
-
- return NULL;
-#endif
- }
- else {
+ } else {
conn->conn_read = raw_socket_read;
conn->conn_write = raw_socket_write;
conn->conn_open = raw_socket_open;
conn->conn_read = raw_socket_read;
conn->conn_write = raw_socket_write;
conn->conn_open = raw_socket_open;