Fixed passive connect waiting bug

Author: jgg
Date: 2000-06-18 04:19:39 GMT
Fixed passive connect waiting bug

diff --git a/methods/ftp.cc b/methods/ftp.cc
index ac12d09131d20a1f61ffc7f0b978f2fa7e67e777..57095c4bf1e594f2391670f40f4a992d380ef990 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: ftp.cc,v 1.19 2000/01/10 03:44:54 jgg Exp $
+// $Id: ftp.cc,v 1.20 2000/06/18 04:19:39 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the FTP aquire method for APT.
@@ -536,11 +536,11 @@ bool FTPConn::CreateDataFd()
    
       /* This implements a timeout for connect by opening the connection
          nonblocking */
-      if (WaitFd(ServerFd,true,TimeOut) == false)
+      if (WaitFd(DataFd,true,TimeOut) == false)
         return _error->Error("Could not connect data socket, connection timed out");
       unsigned int Err;
       unsigned int Len = sizeof(Err);
-      if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
+      if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
         return _error->Errno("getsockopt","Failed");
       if (Err != 0)
         return _error->Error("Could not connect.");