X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_socket.c;h=9029b3e11874f876ba2c4c743ce4eae783a6d4f4;hp=94dbfc52fb0eee54e3942f3146520efafaac5a1d;hb=b0a700a4558d9bb59395ddcf08565a5e709841e1;hpb=be393b838c5e0b8dfe9bedcc7a4a63f05caae7c4

diff --git a/mutt_socket.c b/mutt_socket.c
index 94dbfc5..9029b3e 100644
--- 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) {
-#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;
     }
@@ -477,6 +475,7 @@ int raw_socket_open (CONNECTION * conn)
 
     if (fd >= 0) {
       if ((rc = socket_connect (fd, (struct sockaddr *) &sin)) == 0) {
+        fcntl (fd, F_SETFD, FD_CLOEXEC);
         conn->fd = fd;
         break;
       }