respect user pinning in M-A:same version (un)screwing

[apt.git] / methods / ftp.cc

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 57095c4bf1e594f2391670f40f4a992d380ef990..a8bc95938f5c47ad2341de40f809a50c1ff8dd34 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,9 +1,9 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: ftp.cc,v 1.20 2000/06/18 04:19:39 jgg Exp $
+// $Id: ftp.cc,v 1.31.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
 /* ######################################################################
 

-   HTTP Aquire Method - This is the FTP aquire method for APT.
+   FTP Acquire Method - This is the FTP acquire method for APT.

 
    This is a very simple implementation that does not try to optimize
    at all. Commands are sent syncronously with the FTP server (as the
 
    This is a very simple implementation that does not try to optimize
    at all. Commands are sent syncronously with the FTP server (as the


@@ -15,31 +15,56 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/md5.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>

 
 

+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>

 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/time.h>

-#include <utime.h>

 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>

+#include <iostream>

 
 // Internet stuff
 #include <netinet/in.h>
 
 // Internet stuff
 #include <netinet/in.h>

-#include <sys/socket.h>

 #include <arpa/inet.h>
 #include <netdb.h>
 
 #include "rfc2553emu.h"
 #include "connect.h"
 #include "ftp.h"
 #include <arpa/inet.h>
 #include <netdb.h>
 
 #include "rfc2553emu.h"
 #include "connect.h"
 #include "ftp.h"

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using namespace std;
+
+/* This table is for the EPRT and EPSV commands, it maps the OS address
+   family to the IETF address families */
+struct AFMap
+{
+   unsigned long Family;
+   unsigned long IETFFamily;
+};
+
+#ifndef AF_INET6
+struct AFMap AFMap[] = {{AF_INET,1},{0, 0}};
+#else
+struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{0, 0}};
+#endif
+

 unsigned long TimeOut = 120;
 URI Proxy;
 string FtpMethod::FailFile;
 unsigned long TimeOut = 120;
 URI Proxy;
 string FtpMethod::FailFile;


@@ -49,11 +74,14 @@ time_t FtpMethod::FailTime = 0;
 // FTPConn::FTPConn - Constructor                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // FTPConn::FTPConn - Constructor                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1), 
-                            DataListenFd(-1), ServerName(Srv)
+FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1),
+                            DataListenFd(-1), ServerName(Srv),
+                           ForceExtended(false), TryPassive(true),
+                           PeerAddrLen(0), ServerAddrLen(0)

 {
    Debug = _config->FindB("Debug::Acquire::Ftp",false);
 {
    Debug = _config->FindB("Debug::Acquire::Ftp",false);

-   memset(&PasvAddr,0,sizeof(PasvAddr));
+   PasvAddr = 0;
+   Buffer[0] = '\0';

 }
                                                                        /*}}}*/
 // FTPConn::~FTPConn - Destructor                                      /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::~FTPConn - Destructor                                      /*{{{*/


@@ -75,7 +103,10 @@ void FTPConn::Close()
    DataFd = -1;
    close(DataListenFd);
    DataListenFd = -1;
    DataFd = -1;
    close(DataListenFd);
    DataListenFd = -1;

-   memset(&PasvAddr,0,sizeof(PasvAddr));
+   
+   if (PasvAddr != 0)
+      freeaddrinfo(PasvAddr);
+   PasvAddr = 0;

 }
                                                                        /*}}}*/
 // FTPConn::Open - Open a new connection                               /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::Open - Open a new connection                               /*{{{*/


@@ -89,24 +120,36 @@ bool FTPConn::Open(pkgAcqMethod *Owner)
       return true;
    
    Close();
       return true;
    
    Close();

-
+   

    // Determine the proxy setting
    // Determine the proxy setting

-   if (getenv("ftp_proxy") == 0)
+   string SpecificProxy = _config->Find("Acquire::ftp::Proxy::" + ServerName.Host);
+   if (!SpecificProxy.empty())

    {
    {

-      string DefProxy = _config->Find("Acquire::ftp::Proxy");
-      string SpecificProxy = _config->Find("Acquire::ftp::Proxy::" + ServerName.Host);
-      if (SpecificProxy.empty() == false)
-      {
-        if (SpecificProxy == "DIRECT")
-           Proxy = "";
-        else
-           Proxy = SpecificProxy;
-      }   
-      else
-        Proxy = DefProxy;
+          if (SpecificProxy == "DIRECT")
+                  Proxy = "";
+          else
+                  Proxy = SpecificProxy;

    }
    else
    }
    else

-      Proxy = getenv("ftp_proxy");
+   {
+          string DefProxy = _config->Find("Acquire::ftp::Proxy");
+          if (!DefProxy.empty())
+          {
+                  Proxy = DefProxy;
+          }
+          else
+          {
+                  char* result = getenv("ftp_proxy");
+                  Proxy = result ? result : "";
+          }
+   }
+
+   // Parse no_proxy, a , separated list of domains
+   if (getenv("no_proxy") != 0)
+   {
+      if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+        Proxy = "";
+   }

    
    // Determine what host and port to use based on the proxy settings
    int Port = 0;
    
    // Determine what host and port to use based on the proxy settings
    int Port = 0;


@@ -124,15 +167,27 @@ bool FTPConn::Open(pkgAcqMethod *Owner)
       Host = Proxy.Host;
    }
 
       Host = Proxy.Host;
    }
 

-   // Connect to the remote server
+   /* Connect to the remote server. Since FTP is connection oriented we
+      want to make sure we get a new server every time we reconnect */
+   RotateDNS();

    if (Connect(Host,Port,"ftp",21,ServerFd,TimeOut,Owner) == false)
       return false;
    if (Connect(Host,Port,"ftp",21,ServerFd,TimeOut,Owner) == false)
       return false;

-   socklen_t Len = sizeof(Peer);
-   if (getpeername(ServerFd,(sockaddr *)&Peer,&Len) != 0)
-      return _error->Errno("getpeername","Unable to determine the peer name");
+
+   // Login must be before getpeername otherwise dante won't work.
+   Owner->Status(_("Logging in"));
+   bool Res = Login();
+   
+   // Get the remote server's address
+   PeerAddrLen = sizeof(PeerAddr);
+   if (getpeername(ServerFd,(sockaddr *)&PeerAddr,&PeerAddrLen) != 0)
+      return _error->Errno("getpeername",_("Unable to determine the peer name"));
+   
+   // Get the local machine's address
+   ServerAddrLen = sizeof(ServerAddr);
+   if (getsockname(ServerFd,(sockaddr *)&ServerAddr,&ServerAddrLen) != 0)
+      return _error->Errno("getsockname",_("Unable to determine the local name"));

    
    

-   Owner->Status("Logging in");
-   return Login();
+   return Res;

 }
                                                                        /*}}}*/
 // FTPConn::Login - Login to the remote server                         /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::Login - Login to the remote server                         /*{{{*/


@@ -146,7 +201,7 @@ bool FTPConn::Login()
    
    // Setup the variables needed for authentication
    string User = "anonymous";
    
    // Setup the variables needed for authentication
    string User = "anonymous";

-   string Pass = "apt_get_ftp_2.0@debian.linux.user";
+   string Pass = "apt_get_ftp_2.1@debian.linux.user";

 
    // Fill in the user/pass
    if (ServerName.User.empty() == false)
 
    // Fill in the user/pass
    if (ServerName.User.empty() == false)


@@ -161,25 +216,27 @@ bool FTPConn::Login()
       if (ReadResp(Tag,Msg) == false)
         return false;
       if (Tag >= 400)
       if (ReadResp(Tag,Msg) == false)
         return false;
       if (Tag >= 400)

-        return _error->Error("Server refused our connection and said: %s",Msg.c_str());
+        return _error->Error(_("The server refused the connection and said: %s"),Msg.c_str());

       
       // Send the user
       if (WriteMsg(Tag,Msg,"USER %s",User.c_str()) == false)
         return false;
       if (Tag >= 400)
       
       // Send the user
       if (WriteMsg(Tag,Msg,"USER %s",User.c_str()) == false)
         return false;
       if (Tag >= 400)

-        return _error->Error("USER failed, server said: %s",Msg.c_str());
+        return _error->Error(_("USER failed, server said: %s"),Msg.c_str());

       
       

-      // Send the Password
-      if (WriteMsg(Tag,Msg,"PASS %s",Pass.c_str()) == false)
-        return false;
-      if (Tag >= 400)
-        return _error->Error("PASS failed, server said: %s",Msg.c_str());
+      if (Tag == 331) { // 331 User name okay, need password.
+         // Send the Password
+         if (WriteMsg(Tag,Msg,"PASS %s",Pass.c_str()) == false)
+            return false;
+         if (Tag >= 400)
+            return _error->Error(_("PASS failed, server said: %s"),Msg.c_str());
+      }

       
       // Enter passive mode
       if (_config->Exists("Acquire::FTP::Passive::" + ServerName.Host) == true)
         TryPassive = _config->FindB("Acquire::FTP::Passive::" + ServerName.Host,true);
       else
       
       // Enter passive mode
       if (_config->Exists("Acquire::FTP::Passive::" + ServerName.Host) == true)
         TryPassive = _config->FindB("Acquire::FTP::Passive::" + ServerName.Host,true);
       else

-        TryPassive = _config->FindB("Acquire::FTP::Passive",true);
+        TryPassive = _config->FindB("Acquire::FTP::Passive",true);      

    }
    else
    {      
    }
    else
    {      


@@ -187,13 +244,13 @@ bool FTPConn::Login()
       if (ReadResp(Tag,Msg) == false)
         return false;
       if (Tag >= 400)
       if (ReadResp(Tag,Msg) == false)
         return false;
       if (Tag >= 400)

-        return _error->Error("Server refused our connection and said: %s",Msg.c_str());
+        return _error->Error(_("The server refused the connection and said: %s"),Msg.c_str());

       
       // Perform proxy script execution
       Configuration::Item const *Opts = _config->Tree("Acquire::ftp::ProxyLogin");
       if (Opts == 0 || Opts->Child == 0)
       
       // Perform proxy script execution
       Configuration::Item const *Opts = _config->Tree("Acquire::ftp::ProxyLogin");
       if (Opts == 0 || Opts->Child == 0)

-        return _error->Error("A proxy server was specified but no login "
-                             "script, Acquire::ftp::ProxyLogin is empty.");
+        return _error->Error(_("A proxy server was specified but no login "
+                             "script, Acquire::ftp::ProxyLogin is empty."));

       Opts = Opts->Child;
 
       // Iterate over the entire login script
       Opts = Opts->Child;
 
       // Iterate over the entire login script


@@ -201,26 +258,28 @@ bool FTPConn::Login()
       {
         if (Opts->Value.empty() == true)
            continue;
       {
         if (Opts->Value.empty() == true)
            continue;

-        
+

         // Substitute the variables into the command
         // Substitute the variables into the command

-        char SitePort[20];
-        if (ServerName.Port != 0)
-           sprintf(SitePort,"%u",ServerName.Port);
-        else
-           strcpy(SitePort,"21");

         string Tmp = Opts->Value;
         Tmp = SubstVar(Tmp,"$(PROXY_USER)",Proxy.User);
         Tmp = SubstVar(Tmp,"$(PROXY_PASS)",Proxy.Password);
         Tmp = SubstVar(Tmp,"$(SITE_USER)",User);
         Tmp = SubstVar(Tmp,"$(SITE_PASS)",Pass);
         string Tmp = Opts->Value;
         Tmp = SubstVar(Tmp,"$(PROXY_USER)",Proxy.User);
         Tmp = SubstVar(Tmp,"$(PROXY_PASS)",Proxy.Password);
         Tmp = SubstVar(Tmp,"$(SITE_USER)",User);
         Tmp = SubstVar(Tmp,"$(SITE_PASS)",Pass);

-        Tmp = SubstVar(Tmp,"$(SITE_PORT)",SitePort);
+        if (ServerName.Port != 0)
+        {
+           std::string SitePort;
+           strprintf(SitePort, "%u", ServerName.Port);
+           Tmp = SubstVar(Tmp,"$(SITE_PORT)", SitePort);
+        }
+        else
+           Tmp = SubstVar(Tmp,"$(SITE_PORT)", "21");

         Tmp = SubstVar(Tmp,"$(SITE)",ServerName.Host);
 
         // Send the command
         if (WriteMsg(Tag,Msg,"%s",Tmp.c_str()) == false)
            return false;
         if (Tag >= 400)
         Tmp = SubstVar(Tmp,"$(SITE)",ServerName.Host);
 
         // Send the command
         if (WriteMsg(Tag,Msg,"%s",Tmp.c_str()) == false)
            return false;
         if (Tag >= 400)

-           return _error->Error("Login script command '%s' failed, server said: %s",Tmp.c_str(),Msg.c_str());   
+           return _error->Error(_("Login script command '%s' failed, server said: %s"),Tmp.c_str(),Msg.c_str());        

       }
       
       // Enter passive mode
       }
       
       // Enter passive mode


@@ -236,11 +295,17 @@ bool FTPConn::Login()
       }            
    }
 
       }            
    }
 

+   // Force the use of extended commands
+   if (_config->Exists("Acquire::FTP::ForceExtended::" + ServerName.Host) == true)
+      ForceExtended = _config->FindB("Acquire::FTP::ForceExtended::" + ServerName.Host,true);
+   else
+      ForceExtended = _config->FindB("Acquire::FTP::ForceExtended",false);
+   

    // Binary mode
    if (WriteMsg(Tag,Msg,"TYPE I") == false)
       return false;
    if (Tag >= 400)
    // Binary mode
    if (WriteMsg(Tag,Msg,"TYPE I") == false)
       return false;
    if (Tag >= 400)

-      return _error->Error("TYPE failed, server said: %s",Msg.c_str());
+      return _error->Error(_("TYPE failed, server said: %s"),Msg.c_str());

    
    return true;
 }
    
    return true;
 }


@@ -278,21 +343,23 @@ bool FTPConn::ReadLine(string &Text)
       if (WaitFd(ServerFd,false,TimeOut) == false)
       {
         Close();
       if (WaitFd(ServerFd,false,TimeOut) == false)
       {
         Close();

-        return _error->Error("Connection timeout");
+        return _error->Error(_("Connection timeout"));

       }
       
       // Suck it back
       int Res = read(ServerFd,Buffer + Len,sizeof(Buffer) - Len);
       }
       
       // Suck it back
       int Res = read(ServerFd,Buffer + Len,sizeof(Buffer) - Len);

+      if (Res == 0)
+        _error->Error(_("Server closed the connection"));

       if (Res <= 0)
       {
       if (Res <= 0)
       {

-        _error->Errno("read","Read error");
+        _error->Errno("read",_("Read error"));

         Close();
         return false;
       }      
       Len += Res;
    }
 
         Close();
         return false;
       }      
       Len += Res;
    }
 

-   return _error->Error("A response overflowed the buffer.");
+   return _error->Error(_("A response overflowed the buffer."));

 }
                                                                        /*}}}*/
 // FTPConn::ReadResp - Read a full response from the server            /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::ReadResp - Read a full response from the server            /*{{{*/


@@ -309,7 +376,7 @@ bool FTPConn::ReadResp(unsigned int &Ret,string &Text)
    char *End;   
    Ret = strtol(Msg.c_str(),&End,10);
    if (End - Msg.c_str() != 3)
    char *End;   
    Ret = strtol(Msg.c_str(),&End,10);
    if (End - Msg.c_str() != 3)

-      return _error->Error("Protocol corruption");
+      return _error->Error(_("Protocol corruption"));

 
    // All done ?
    Text = Msg.c_str()+4;
 
    // All done ?
    Text = Msg.c_str()+4;


@@ -321,7 +388,7 @@ bool FTPConn::ReadResp(unsigned int &Ret,string &Text)
    }
    
    if (*End != '-')
    }
    
    if (*End != '-')

-      return _error->Error("Protocol corruption");
+      return _error->Error(_("Protocol corruption"));

    
    /* Okay, here we do the continued message trick. This is foolish, but
       proftpd follows the protocol as specified and wu-ftpd doesn't, so 
    
    /* Okay, here we do the continued message trick. This is foolish, but
       proftpd follows the protocol as specified and wu-ftpd doesn't, so 


@@ -375,6 +442,7 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
    char S[400];
    vsnprintf(S,sizeof(S) - 4,Fmt,args);
    strcat(S,"\r\n");
    char S[400];
    vsnprintf(S,sizeof(S) - 4,Fmt,args);
    strcat(S,"\r\n");

+   va_end(args);

  
    if (Debug == true)
       cerr << "-> '" << QuoteString(S,"") << "'" << endl;
  
    if (Debug == true)
       cerr << "-> '" << QuoteString(S,"") << "'" << endl;


@@ -387,13 +455,13 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
       if (WaitFd(ServerFd,true,TimeOut) == false)
       {
         Close();
       if (WaitFd(ServerFd,true,TimeOut) == false)
       {
         Close();

-        return _error->Error("Connection timeout");
+        return _error->Error(_("Connection timeout"));

       }
       
       int Res = write(ServerFd,S + Start,Len);
       if (Res <= 0)
       {
       }
       
       int Res = write(ServerFd,S + Start,Len);
       if (Res <= 0)
       {

-        _error->Errno("write","Write Error");
+        _error->Errno("write",_("Write error"));

         Close();
         return false;
       }
         Close();
         return false;
       }


@@ -409,10 +477,19 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...)
 // ---------------------------------------------------------------------
 /* Try to enter passive mode, the return code does not indicate if passive
    mode could or could not be established, only if there was a fatal error. 
 // ---------------------------------------------------------------------
 /* Try to enter passive mode, the return code does not indicate if passive
    mode could or could not be established, only if there was a fatal error. 

-   Borrowed mostly from lftp. We have to enter passive mode every time 
- we make a data connection :| */
+   We have to enter passive mode every time we make a data connection :| */

 bool FTPConn::GoPasv()
 {
 bool FTPConn::GoPasv()
 {

+   /* The PASV command only works on IPv4 sockets, even though it could
+      in theory suppory IPv6 via an all zeros reply */
+   if (((struct sockaddr *)&PeerAddr)->sa_family != AF_INET || 
+       ForceExtended == true)
+      return ExtGoPasv();
+   
+   if (PasvAddr != 0)
+      freeaddrinfo(PasvAddr);
+   PasvAddr = 0;
+   

    // Try to enable pasv mode
    unsigned int Tag;
    string Msg;
    // Try to enable pasv mode
    unsigned int Tag;
    string Msg;


@@ -422,41 +499,138 @@ bool FTPConn::GoPasv()
    // Unsupported function
    string::size_type Pos = Msg.find('(');
    if (Tag >= 400 || Pos == string::npos)
    // Unsupported function
    string::size_type Pos = Msg.find('(');
    if (Tag >= 400 || Pos == string::npos)

-   {
-      memset(&PasvAddr,0,sizeof(PasvAddr));

       return true;
       return true;

-   }

 
    // Scan it
    unsigned a0,a1,a2,a3,p0,p1;
    if (sscanf(Msg.c_str() + Pos,"(%u,%u,%u,%u,%u,%u)",&a0,&a1,&a2,&a3,&p0,&p1) != 6)
 
    // Scan it
    unsigned a0,a1,a2,a3,p0,p1;
    if (sscanf(Msg.c_str() + Pos,"(%u,%u,%u,%u,%u,%u)",&a0,&a1,&a2,&a3,&p0,&p1) != 6)

+      return true;
+   
+   /* Some evil servers return 0 to mean their addr. We can actually speak
+      to these servers natively using IPv6 */
+   if (a0 == 0 && a1 == 0 && a2 == 0 && a3 == 0)

    {
    {

-      memset(&PasvAddr,0,sizeof(PasvAddr));
+      // Get the IP in text form
+      char Name[NI_MAXHOST];
+      char Service[NI_MAXSERV];
+      getnameinfo((struct sockaddr *)&PeerAddr,PeerAddrLen,
+                 Name,sizeof(Name),Service,sizeof(Service),
+                 NI_NUMERICHOST|NI_NUMERICSERV);
+      
+      struct addrinfo Hints;
+      memset(&Hints,0,sizeof(Hints));
+      Hints.ai_socktype = SOCK_STREAM;
+      Hints.ai_family = ((struct sockaddr *)&PeerAddr)->sa_family;
+      Hints.ai_flags |= AI_NUMERICHOST;
+      
+      // Get a new passive address.
+      char Port[100];
+      snprintf(Port,sizeof(Port),"%u",(p0 << 8) + p1);
+      if (getaddrinfo(Name,Port,&Hints,&PasvAddr) != 0)
+        return true;

       return true;
    }
    
       return true;
    }
    

-   // lftp used this horrid byte order manipulation.. Ik.
-   PasvAddr.sin_family = AF_INET;
-   unsigned char *a;
-   unsigned char *p;
-   a = (unsigned char *)&PasvAddr.sin_addr;
-   p = (unsigned char *)&PasvAddr.sin_port;
+   struct addrinfo Hints;
+   memset(&Hints,0,sizeof(Hints));
+   Hints.ai_socktype = SOCK_STREAM;
+   Hints.ai_family = AF_INET;
+   Hints.ai_flags |= AI_NUMERICHOST;

    
    

-   // Some evil servers return 0 to mean their addr
-   if (a0 == 0 && a1 == 0 && a2 == 0 && a3 == 0)
+   // Get a new passive address.
+   char Port[100];
+   snprintf(Port,sizeof(Port),"%u",(p0 << 8) + p1);
+   char Name[100];
+   snprintf(Name,sizeof(Name),"%u.%u.%u.%u",a0,a1,a2,a3);
+   if (getaddrinfo(Name,Port,&Hints,&PasvAddr) != 0)
+      return true;
+   return true;
+}
+                                                                       /*}}}*/
+// FTPConn::ExtGoPasv - Enter Extended Passive mode                    /*{{{*/
+// ---------------------------------------------------------------------
+/* Try to enter extended passive mode. See GoPasv above and RFC 2428 */
+bool FTPConn::ExtGoPasv()
+{
+   if (PasvAddr != 0)
+      freeaddrinfo(PasvAddr);
+   PasvAddr = 0;
+   
+   // Try to enable pasv mode
+   unsigned int Tag;
+   string Msg;
+   if (WriteMsg(Tag,Msg,"EPSV") == false)
+      return false;
+   
+   // Unsupported function
+   string::size_type Pos = Msg.find('(');
+   if (Tag >= 400 || Pos == string::npos)
+      return true;
+
+   // Scan it   
+   string::const_iterator List[4];
+   unsigned Count = 0;
+   Pos++;
+   for (string::const_iterator I = Msg.begin() + Pos; I < Msg.end(); ++I)

    {
    {

-      PasvAddr.sin_addr = Peer.sin_addr;
+      if (*I != Msg[Pos])
+        continue;
+      if (Count >= 4)
+        return true;
+      List[Count++] = I;
+   }
+   if (Count != 4)
+      return true;
+   
+   // Break it up ..
+   unsigned long Proto = 0;
+   unsigned long Port = 0;
+   string IP;
+   IP = string(List[1]+1,List[2]);
+   Port = atoi(string(List[2]+1,List[3]).c_str());
+   if (IP.empty() == false)
+      Proto = atoi(string(List[0]+1,List[1]).c_str());
+   
+   if (Port == 0)
+      return false;
+
+   // String version of the port
+   char PStr[100];
+   snprintf(PStr,sizeof(PStr),"%lu",Port);
+
+   // Get the IP in text form
+   struct addrinfo Hints;
+   memset(&Hints,0,sizeof(Hints));
+   Hints.ai_socktype = SOCK_STREAM;
+   Hints.ai_flags |= AI_NUMERICHOST;
+   
+   /* The RFC defined case, connect to the old IP/protocol using the
+      new port. */
+   if (IP.empty() == true)
+   {
+      // Get the IP in text form
+      char Name[NI_MAXHOST];
+      char Service[NI_MAXSERV];
+      getnameinfo((struct sockaddr *)&PeerAddr,PeerAddrLen,
+                 Name,sizeof(Name),Service,sizeof(Service),
+                 NI_NUMERICHOST|NI_NUMERICSERV);
+      IP = Name;
+      Hints.ai_family = ((struct sockaddr *)&PeerAddr)->sa_family;

    }
    else
    {
    }
    else
    {

-      a[0] = a0; 
-      a[1] = a1; 
-      a[2] = a2; 
-      a[3] = a3;
+      // Get the family..
+      Hints.ai_family = 0;
+      for (unsigned J = 0; AFMap[J].Family != 0; J++)
+        if (AFMap[J].IETFFamily == Proto)
+           Hints.ai_family = AFMap[J].Family;
+      if (Hints.ai_family == 0)
+        return true;

    }
    
    }
    

-   p[0] = p0;
-   p[1] = p1;
+   // Get a new passive address.
+   if (getaddrinfo(IP.c_str(),PStr,&Hints,&PasvAddr) != 0)
+      return true;

    
    return true;
 }
    
    return true;
 }


@@ -464,7 +638,7 @@ bool FTPConn::GoPasv()
 // FTPConn::Size - Return the size of a file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* Grab the file size from the server, 0 means no size or empty file */
 // FTPConn::Size - Return the size of a file                           /*{{{*/
 // ---------------------------------------------------------------------
 /* Grab the file size from the server, 0 means no size or empty file */

-bool FTPConn::Size(const char *Path,unsigned long &Size)
+bool FTPConn::Size(const char *Path,unsigned long long &Size)

 {
    // Query the size
    unsigned int Tag;
 {
    // Query the size
    unsigned int Tag;


@@ -474,7 +648,7 @@ bool FTPConn::Size(const char *Path,unsigned long &Size)
       return false;
    
    char *End;
       return false;
    
    char *End;

-   Size = strtol(Msg.c_str(),&End,10);
+   Size = strtoull(Msg.c_str(),&End,10);

    if (Tag >= 400 || End == Msg.c_str())
       Size = 0;
    return true;
    if (Tag >= 400 || End == Msg.c_str())
       Size = 0;
    return true;


@@ -498,8 +672,7 @@ bool FTPConn::ModTime(const char *Path, time_t &Time)
       return true;
    
    // Parse it
       return true;
    
    // Parse it

-   StrToTime(Msg,Time);
-   return true;
+   return FTPMDTMStrToTime(Msg.c_str(), Time);

 }
                                                                        /*}}}*/
 // FTPConn::CreateDataFd - Get a data connection                       /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::CreateDataFd - Get a data connection                       /*{{{*/


@@ -517,34 +690,35 @@ bool FTPConn::CreateDataFd()
         return false;
       
       // Oops, didn't work out, don't bother trying again.
         return false;
       
       // Oops, didn't work out, don't bother trying again.

-      if (PasvAddr.sin_port == 0)
+      if (PasvAddr == 0)

         TryPassive = false;
    }
    
    // Passive mode?
         TryPassive = false;
    }
    
    // Passive mode?

-   if (PasvAddr.sin_port != 0)
+   if (PasvAddr != 0)

    {
       // Get a socket
    {
       // Get a socket

-      if ((DataFd = socket(AF_INET,SOCK_STREAM,0)) < 0)
-        return _error->Errno("socket","Could not create a socket");
+      if ((DataFd = socket(PasvAddr->ai_family,PasvAddr->ai_socktype,
+                          PasvAddr->ai_protocol)) < 0)
+        return _error->Errno("socket",_("Could not create a socket"));

       
       // Connect to the server
       SetNonBlock(DataFd,true);
       
       // Connect to the server
       SetNonBlock(DataFd,true);

-      if (connect(DataFd,(sockaddr *)&PasvAddr,sizeof(PasvAddr)) < 0 &&
+      if (connect(DataFd,PasvAddr->ai_addr,PasvAddr->ai_addrlen) < 0 &&

          errno != EINPROGRESS)
          errno != EINPROGRESS)

-        return _error->Errno("socket","Could not create a socket");
+        return _error->Errno("socket",_("Could not create a socket"));

    
       /* This implements a timeout for connect by opening the connection
          nonblocking */
       if (WaitFd(DataFd,true,TimeOut) == false)
    
       /* This implements a timeout for connect by opening the connection
          nonblocking */
       if (WaitFd(DataFd,true,TimeOut) == false)

-        return _error->Error("Could not connect data socket, connection timed out");
+        return _error->Error(_("Could not connect data socket, connection timed out"));

       unsigned int Err;
       unsigned int Len = sizeof(Err);
       if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
       unsigned int Err;
       unsigned int Len = sizeof(Err);
       if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)

-        return _error->Errno("getsockopt","Failed");
+        return _error->Errno("getsockopt",_("Failed"));

       if (Err != 0)
       if (Err != 0)

-        return _error->Error("Could not connect.");
-      
+        return _error->Error(_("Could not connect passive socket."));
+

       return true;
    }
    
       return true;
    }
    


@@ -552,43 +726,91 @@ bool FTPConn::CreateDataFd()
    close(DataListenFd);
    DataListenFd = -1;
 
    close(DataListenFd);
    DataListenFd = -1;
 

-   // Get a socket
-   if ((DataListenFd = socket(AF_INET,SOCK_STREAM,0)) < 0)
-      return _error->Errno("socket","Could not create a socket");
+   // Get the information for a listening socket.
+   struct addrinfo *BindAddr = NULL;
+   struct addrinfo Hints;
+   memset(&Hints,0,sizeof(Hints));
+   Hints.ai_socktype = SOCK_STREAM;
+   Hints.ai_flags |= AI_PASSIVE;
+   Hints.ai_family = ((struct sockaddr *)&ServerAddr)->sa_family;
+   if (getaddrinfo(0,"0",&Hints,&BindAddr) != 0 || BindAddr == NULL)
+      return _error->Error(_("getaddrinfo was unable to get a listening socket"));
+   
+   // Construct the socket
+   if ((DataListenFd = socket(BindAddr->ai_family,BindAddr->ai_socktype,
+                             BindAddr->ai_protocol)) < 0)
+   {
+      freeaddrinfo(BindAddr);
+      return _error->Errno("socket",_("Could not create a socket"));
+   }

    
    // Bind and listen
    
    // Bind and listen

-   sockaddr_in Addr;
-   memset(&Addr,0,sizeof(Addr));
-   if (bind(DataListenFd,(sockaddr *)&Addr,sizeof(Addr)) < 0)
-      return _error->Errno("bind","Could not bind a socket");
+   if (::bind(DataListenFd,BindAddr->ai_addr,BindAddr->ai_addrlen) < 0)
+   {
+      freeaddrinfo(BindAddr);
+      return _error->Errno("bind",_("Could not bind a socket"));
+   }
+   freeaddrinfo(BindAddr);   

    if (listen(DataListenFd,1) < 0)
    if (listen(DataListenFd,1) < 0)

-      return _error->Errno("listen","Could not listen on the socket");
+      return _error->Errno("listen",_("Could not listen on the socket"));

    SetNonBlock(DataListenFd,true);
    
    // Determine the name to send to the remote
    SetNonBlock(DataListenFd,true);
    
    // Determine the name to send to the remote

-   sockaddr_in Addr2;
-   socklen_t Jnk = sizeof(Addr);
-   if (getsockname(DataListenFd,(sockaddr *)&Addr,&Jnk) < 0)
-      return _error->Errno("getsockname","Could not determine the socket's name");
-   Jnk = sizeof(Addr2);
-   if (getsockname(ServerFd,(sockaddr *)&Addr2,&Jnk) < 0)
-      return _error->Errno("getsockname","Could not determine the socket's name");
-   
-   // This bit ripped from qftp
-   unsigned long badr = ntohl(*(unsigned long *)&Addr2.sin_addr);
-   unsigned long bp = ntohs(Addr.sin_port);
-
-   // Send the port command
+   struct sockaddr_storage Addr;
+   socklen_t AddrLen = sizeof(Addr);
+   if (getsockname(DataListenFd,(sockaddr *)&Addr,&AddrLen) < 0)
+      return _error->Errno("getsockname",_("Could not determine the socket's name"));
+
+
+   // Reverse the address. We need the server address and the data port.
+   char Name[NI_MAXHOST];
+   char Service[NI_MAXSERV];
+   char Service2[NI_MAXSERV];
+   getnameinfo((struct sockaddr *)&Addr,AddrLen,
+              Name,sizeof(Name),Service,sizeof(Service),
+              NI_NUMERICHOST|NI_NUMERICSERV);
+   getnameinfo((struct sockaddr *)&ServerAddr,ServerAddrLen,
+              Name,sizeof(Name),Service2,sizeof(Service2),
+              NI_NUMERICHOST|NI_NUMERICSERV);
+
+   // Send off an IPv4 address in the old port format
+   if (((struct sockaddr *)&Addr)->sa_family == AF_INET && 
+       ForceExtended == false)
+   {
+      // Convert the dots in the quad into commas
+      for (char *I = Name; *I != 0; I++)
+        if (*I == '.')
+           *I = ',';
+      unsigned long Port = atoi(Service);
+      
+      // Send the port command
+      unsigned int Tag;
+      string Msg;
+      if (WriteMsg(Tag,Msg,"PORT %s,%d,%d",
+                  Name,
+                  (int)(Port >> 8) & 0xff, (int)(Port & 0xff)) == false)
+        return false;
+      if (Tag >= 400)
+        return _error->Error(_("Unable to send PORT command"));
+      return true;
+   }
+
+   // Construct an EPRT command
+   unsigned Proto = 0;
+   for (unsigned J = 0; AFMap[J].Family != 0; J++)
+      if (AFMap[J].Family == ((struct sockaddr *)&Addr)->sa_family)
+        Proto = AFMap[J].IETFFamily;
+   if (Proto == 0)
+      return _error->Error(_("Unknown address family %u (AF_*)"),
+                          ((struct sockaddr *)&Addr)->sa_family);
+   
+   // Send the EPRT command

    unsigned int Tag;
    string Msg;
    unsigned int Tag;
    string Msg;

-   if (WriteMsg(Tag,Msg,"PORT %d,%d,%d,%d,%d,%d", 
-               (int) (badr >> 24) & 0xff, (int) (badr >> 16) & 0xff, 
-               (int) (badr >> 8) & 0xff,  (int) badr & 0xff, 
-               (int) (bp >> 8) & 0xff, (int) bp & 0xff) == false)
+   if (WriteMsg(Tag,Msg,"EPRT |%u|%s|%s|",Proto,Name,Service) == false)

       return false;
    if (Tag >= 400)
       return false;
    if (Tag >= 400)

-      return _error->Error("Unable to send port command");
-
+      return _error->Error(_("EPRT failed, server said: %s"),Msg.c_str());

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -599,7 +821,7 @@ bool FTPConn::CreateDataFd()
 bool FTPConn::Finalize()
 {
    // Passive mode? Do nothing
 bool FTPConn::Finalize()
 {
    // Passive mode? Do nothing

-   if (PasvAddr.sin_port != 0)
+   if (PasvAddr != 0)

       return true;
    
    // Close any old socket..
       return true;
    
    // Close any old socket..


@@ -608,14 +830,14 @@ bool FTPConn::Finalize()
    
    // Wait for someone to connect..
    if (WaitFd(DataListenFd,false,TimeOut) == false)
    
    // Wait for someone to connect..
    if (WaitFd(DataListenFd,false,TimeOut) == false)

-      return _error->Error("Data socket connect timed out");
+      return _error->Error(_("Data socket connect timed out"));

       
    // Accept the connection
    struct sockaddr_in Addr;
    socklen_t Len = sizeof(Addr);
    DataFd = accept(DataListenFd,(struct sockaddr *)&Addr,&Len);
    if (DataFd < 0)
       
    // Accept the connection
    struct sockaddr_in Addr;
    socklen_t Len = sizeof(Addr);
    DataFd = accept(DataListenFd,(struct sockaddr *)&Addr,&Len);
    if (DataFd < 0)

-      return _error->Errno("accept","Unable to accept connection");
+      return _error->Errno("accept",_("Unable to accept connection"));

 
    close(DataListenFd);
    DataListenFd = -1;
 
    close(DataListenFd);
    DataListenFd = -1;


@@ -627,8 +849,9 @@ bool FTPConn::Finalize()
 // ---------------------------------------------------------------------
 /* This opens a data connection, sends REST and RETR and then
    transfers the file over. */
 // ---------------------------------------------------------------------
 /* This opens a data connection, sends REST and RETR and then
    transfers the file over. */

-bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
-                 MD5Summation &MD5,bool &Missing)
+bool FTPConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
+                 Hashes &Hash,bool &Missing, unsigned long long MaximumSize,
+                  pkgAcqMethod *Owner)

 {
    Missing = false;
    if (CreateDataFd() == false)
 {
    Missing = false;
    if (CreateDataFd() == false)


@@ -652,9 +875,9 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
    
    if (Resume != 0)
    {
    
    if (Resume != 0)
    {

-      if (MD5.AddFD(To.Fd(),Resume) == false)
+      if (Hash.AddFD(To,Resume) == false)

       {
       {

-        _error->Errno("read","Problem hashing file");
+        _error->Errno("read",_("Problem hashing file"));

         return false;
       }
    }
         return false;
       }
    }


@@ -667,7 +890,7 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
    {
       if (Tag == 550)
         Missing = true;
    {
       if (Tag == 550)
         Missing = true;

-      return _error->Error("Unable to fetch file, server said '%s'",Msg.c_str());
+      return _error->Error(_("Unable to fetch file, server said '%s'"),Msg.c_str());

    }
    
    // Finish off the data connection
    }
    
    // Finish off the data connection


@@ -682,7 +905,7 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
       if (WaitFd(DataFd,false,TimeOut) == false)
       {
         Close();
       if (WaitFd(DataFd,false,TimeOut) == false)
       {
         Close();

-        return _error->Error("Data socket timed out");
+        return _error->Error(_("Data socket timed out"));

       }
       
       // Read the data..
       }
       
       // Read the data..


@@ -696,12 +919,19 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
         break;
       }
    
         break;
       }
    

-      MD5.Add(Buffer,Res);
+      Hash.Add(Buffer,Res);

       if (To.Write(Buffer,Res) == false)
       {
         Close();
         return false;
       if (To.Write(Buffer,Res) == false)
       {
         Close();
         return false;

-      }      
+      }
+
+      if (MaximumSize > 0 && To.Tell() > MaximumSize)
+      {
+         Owner->SetFailReason("MaximumSizeExceeded");
+         return _error->Error("Writing more data than expected (%llu > %llu)",
+                              To.Tell(), MaximumSize);
+      }

    }
 
    // All done
    }
 
    // All done


@@ -712,7 +942,7 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
    if (ReadResp(Tag,Msg) == false)
       return false;
    if (Tag >= 400)
    if (ReadResp(Tag,Msg) == false)
       return false;
    if (Tag >= 400)

-      return _error->Error("Data transfer failed, server said '%s'",Msg.c_str());
+      return _error->Error(_("Data transfer failed, server said '%s'"),Msg.c_str());

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -720,7 +950,7 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
 // FtpMethod::FtpMethod - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // FtpMethod::FtpMethod - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-FtpMethod::FtpMethod() : pkgAcqMethod("1.0",SendConfig)
+FtpMethod::FtpMethod() : aptMethod("ftp","1.0",SendConfig)

 {
    signal(SIGTERM,SigTerm);
    signal(SIGINT,SigTerm);
 {
    signal(SIGTERM,SigTerm);
    signal(SIGINT,SigTerm);


@@ -731,20 +961,22 @@ FtpMethod::FtpMethod() : pkgAcqMethod("1.0",SendConfig)
                                                                        /*}}}*/
 // FtpMethod::SigTerm - Handle a fatal signal                          /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // FtpMethod::SigTerm - Handle a fatal signal                          /*{{{*/
 // ---------------------------------------------------------------------

-/* This closes and timestamps the open file. This is neccessary to get 
+/* This closes and timestamps the open file. This is necessary to get

    resume behavoir on user abort */
 void FtpMethod::SigTerm(int)
 {
    if (FailFd == -1)
       _exit(100);
    resume behavoir on user abort */
 void FtpMethod::SigTerm(int)
 {
    if (FailFd == -1)
       _exit(100);

-   close(FailFd);
-   
+

    // Timestamp
    // Timestamp

-   struct utimbuf UBuf;
-   UBuf.actime = FailTime;
-   UBuf.modtime = FailTime;
-   utime(FailFile.c_str(),&UBuf);
-   
+   struct timeval times[2];
+   times[0].tv_sec = FailTime;
+   times[1].tv_sec = FailTime;
+   times[0].tv_usec = times[1].tv_usec = 0;
+   utimes(FailFile.c_str(), times);
+
+   close(FailFd);
+

    _exit(100);
 }
                                                                        /*}}}*/
    _exit(100);
 }
                                                                        /*}}}*/


@@ -753,10 +985,11 @@ void FtpMethod::SigTerm(int)
 /* We stash the desired pipeline depth */
 bool FtpMethod::Configuration(string Message)
 {
 /* We stash the desired pipeline depth */
 bool FtpMethod::Configuration(string Message)
 {

-   if (pkgAcqMethod::Configuration(Message) == false)
+   if (aptMethod::Configuration(Message) == false)

       return false;
       return false;

-   
+

    TimeOut = _config->FindI("Acquire::Ftp::Timeout",TimeOut);
    TimeOut = _config->FindI("Acquire::Ftp::Timeout",TimeOut);

+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -770,7 +1003,9 @@ bool FtpMethod::Fetch(FetchItem *Itm)
    FetchResult Res;
    Res.Filename = Itm->DestFile;
    Res.IMSHit = false;
    FetchResult Res;
    Res.Filename = Itm->DestFile;
    Res.IMSHit = false;

-   
+
+   maybe_add_auth (Get, _config->FindFile("Dir::Etc::netrc"));
+

    // Connect to the server
    if (Server == 0 || Server->Comp(Get) == false)
    {
    // Connect to the server
    if (Server == 0 || Server->Comp(Get) == false)
    {


@@ -787,8 +1022,8 @@ bool FtpMethod::Fetch(FetchItem *Itm)
    }
    
    // Get the files information
    }
    
    // Get the files information

-   Status("Query");
-   unsigned long Size;
+   Status(_("Query"));
+   unsigned long long Size;

    if (Server->Size(File,Size) == false ||
        Server->ModTime(File,FailTime) == false)
    {
    if (Server->Size(File,Size) == false ||
        Server->ModTime(File,FailTime) == false)
    {


@@ -810,7 +1045,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
    struct stat Buf;
    if (stat(Itm->DestFile.c_str(),&Buf) == 0)
    {
    struct stat Buf;
    if (stat(Itm->DestFile.c_str(),&Buf) == 0)
    {

-      if (Size == (unsigned)Buf.st_size && FailTime == Buf.st_mtime)
+      if (Size == (unsigned long long)Buf.st_size && FailTime == Buf.st_mtime)

       {
         Res.Size = Buf.st_size;
         Res.LastModified = Buf.st_mtime;
       {
         Res.Size = Buf.st_size;
         Res.LastModified = Buf.st_mtime;


@@ -820,12 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm)
       }
       
       // Resume?
       }
       
       // Resume?

-      if (FailTime == Buf.st_mtime && Size > (unsigned)Buf.st_size)
+      if (FailTime == Buf.st_mtime && Size > (unsigned long long)Buf.st_size)

         Res.ResumePoint = Buf.st_size;
    }
    
    // Open the file
         Res.ResumePoint = Buf.st_size;
    }
    
    // Open the file

-   MD5Summation MD5;
+   Hashes Hash(Itm->ExpectedHashes);

    {
       FileFd Fd(Itm->DestFile,FileFd::WriteAny);
       if (_error->PendingError() == true)
    {
       FileFd Fd(Itm->DestFile,FileFd::WriteAny);
       if (_error->PendingError() == true)


@@ -834,69 +1069,79 @@ bool FtpMethod::Fetch(FetchItem *Itm)
       URIStart(Res);
       
       FailFile = Itm->DestFile;
       URIStart(Res);
       
       FailFile = Itm->DestFile;

-      FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
+      FailFile.c_str();   // Make sure we don't do a malloc in the signal handler

       FailFd = Fd.Fd();
       
       bool Missing;
       FailFd = Fd.Fd();
       
       bool Missing;

-      if (Server->Get(File,Fd,Res.ResumePoint,MD5,Missing) == false)
+      if (Server->Get(File,Fd,Res.ResumePoint,Hash,Missing,Itm->MaximumSize,this) == false)

       {
         Fd.Close();
       {
         Fd.Close();

-        
+

         // Timestamp
         // Timestamp

-        struct utimbuf UBuf;
-        UBuf.actime = FailTime;
-        UBuf.modtime = FailTime;
-        utime(FailFile.c_str(),&UBuf);
-        
-        // If the file is missing we hard fail otherwise transient fail
-        if (Missing == true)
+        struct timeval times[2];
+        times[0].tv_sec = FailTime;
+        times[1].tv_sec = FailTime;
+        times[0].tv_usec = times[1].tv_usec = 0;
+        utimes(FailFile.c_str(), times);
+
+        // If the file is missing we hard fail and delete the destfile
+        // otherwise transient fail
+        if (Missing == true) {
+           RemoveFile("ftp", FailFile);

            return false;
            return false;

+        }

         Fail(true);
         return true;
       }
 
       Res.Size = Fd.Size();
         Fail(true);
         return true;
       }
 
       Res.Size = Fd.Size();

+
+      // Timestamp
+      struct timeval times[2];
+      times[0].tv_sec = FailTime;
+      times[1].tv_sec = FailTime;
+      times[0].tv_usec = times[1].tv_usec = 0;
+      utimes(Fd.Name().c_str(), times);
+      FailFd = -1;

    }
    }

-   
+

    Res.LastModified = FailTime;
    Res.LastModified = FailTime;

-   Res.MD5Sum = MD5.Result();
-   
-   // Timestamp
-   struct utimbuf UBuf;
-   UBuf.actime = FailTime;
-   UBuf.modtime = FailTime;
-   utime(Queue->DestFile.c_str(),&UBuf);
-   FailFd = -1;
+   Res.TakeHashes(Hash);

 
    URIDone(Res);
 
    URIDone(Res);

-   
+

    return true;
 }
                                                                        /*}}}*/
 
    return true;
 }
                                                                        /*}}}*/
 

-int main(int argc,const char *argv[])
+int main(int, const char *argv[])

 { 
 { 

+   setlocale(LC_ALL, "");
+

    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)
    {
       URI Proxy = string(getenv("ftp_proxy"));
    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)
    {
       URI Proxy = string(getenv("ftp_proxy"));

+      
+      // Run the HTTP method

       if (Proxy.Access == "http")
       {
         // Copy over the environment setting
         char S[300];
         snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
         putenv(S);
       if (Proxy.Access == "http")
       {
         // Copy over the environment setting
         char S[300];
         snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
         putenv(S);

+        putenv((char *)"no_proxy=");

         
         // Run the http method
         
         // Run the http method

-        string Path = flNotFile(argv[0]) + "/http";
-        execl(Path.c_str(),Path.c_str(),0);
-        cerr << "Unable to invoke " << Path << endl;
+        string Path = flNotFile(argv[0]) + "http";
+        execl(Path.c_str(),Path.c_str(),(char *)NULL);
+        cerr << _("Unable to invoke ") << Path << endl;

         exit(100);
       }      
    }
    
    FtpMethod Mth;
         exit(100);
       }      
    }
    
    FtpMethod Mth;

-   
+

    return Mth.Run();
 }
    return Mth.Run();
 }