projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andreas Krennmair:
[apps/madmutt.git]
/
mutt_socket.c
diff --git
a/mutt_socket.c
b/mutt_socket.c
index
94dbfc5
..
9029b3e
100644
(file)
--- a/
mutt_socket.c
+++ b/
mutt_socket.c
@@
-237,10
+237,8
@@
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) {
-#ifdef USE_SSL
- ssl_socket_setup (conn);
-#elif USE_GNUTLS
- if (mutt_gnutls_socket_setup (conn) < 0) {
+#if defined (USE_SSL) || defined (USE_GNUTLS)
+ if (mutt_ssl_socket_setup (conn) < 0) {
mutt_socket_free (conn);
return NULL;
}
mutt_socket_free (conn);
return NULL;
}
@@
-477,6
+475,7
@@
int raw_socket_open (CONNECTION * conn)
if (fd >= 0) {
if ((rc = socket_connect (fd, (struct sockaddr *) &sin)) == 0) {
if (fd >= 0) {
if ((rc = socket_connect (fd, (struct sockaddr *) &sin)) == 0) {
+ fcntl (fd, F_SETFD, FD_CLOEXEC);
conn->fd = fd;
break;
}
conn->fd = fd;
break;
}