merged from lp:~donkult/apt/sid/

[apt.git] / methods / ftp.cc

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 97248f900c8eaff56f46e721a6f4958e11576c20..eb7fedd85509bca7e838670d829ebad976ed8f40 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -69,7 +69,8 @@ time_t FtpMethod::FailTime = 0;
 // ---------------------------------------------------------------------
 /* */
 FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1), 
-                            DataListenFd(-1), ServerName(Srv)
+                            DataListenFd(-1), ServerName(Srv),
+                           ForceExtended(false), TryPassive(true)
 {
    Debug = _config->FindB("Debug::Acquire::Ftp",false);
    PasvAddr = 0;
@@ -559,7 +560,7 @@ bool FTPConn::ExtGoPasv()
    string::const_iterator List[4];
    unsigned Count = 0;
    Pos++;
-   for (string::const_iterator I = Msg.begin() + Pos; I < Msg.end(); I++)
+   for (string::const_iterator I = Msg.begin() + Pos; I < Msg.end(); ++I)
    {
       if (*I != Msg[Pos])
         continue;