From 2d7c79af76ea9c35d0ec9512da2211d7aedf2878 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 19 Aug 2011 23:38:45 +0200
Subject: [PATCH] tcpconnect: follow-up commit after b998d95b

As I modified conn->bits.tcpconnect to become an array that holds one
bool for each potential connection all uses of that struct field must
index it correctly.
---
 lib/imap.c | 2 +-
 lib/pop3.c | 2 +-
 lib/smtp.c | 2 +-
 lib/ssh.c  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/imap.c b/lib/imap.c
index f414ee7bb..f6d4362c6 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -841,7 +841,7 @@ CURLcode imap_perform(struct connectdata *conn,
     result = imap_easy_statemach(conn);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done)
     DEBUGF(infof(conn->data, "DO phase is complete\n"));
diff --git a/lib/pop3.c b/lib/pop3.c
index 30766711c..42f6c1dbf 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -787,7 +787,7 @@ CURLcode pop3_perform(struct connectdata *conn,
     result = pop3_easy_statemach(conn);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done)
     DEBUGF(infof(conn->data, "DO phase is complete\n"));
diff --git a/lib/smtp.c b/lib/smtp.c
index aab4f80b4..5fa989346 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1287,7 +1287,7 @@ CURLcode smtp_perform(struct connectdata *conn,
     result = smtp_easy_statemach(conn);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done)
     DEBUGF(infof(conn->data, "DO phase is complete\n"));
diff --git a/lib/ssh.c b/lib/ssh.c
index c46511d5d..acfeb9fa1 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2701,7 +2701,7 @@ CURLcode scp_perform(struct connectdata *conn,
     result = ssh_easy_statemach(conn, FALSE);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done) {
     DEBUGF(infof(conn->data, "DO phase is complete\n"));
@@ -2908,7 +2908,7 @@ CURLcode sftp_perform(struct connectdata *conn,
     result = ssh_easy_statemach(conn, FALSE);
     *dophase_done = TRUE; /* with the easy interface we are done here */
   }
-  *connected = conn->bits.tcpconnect;
+  *connected = conn->bits.tcpconnect[FIRSTSOCKET];
 
   if(*dophase_done) {
     DEBUGF(infof(conn->data, "DO phase is complete\n"));