methods/ftp.h: Handle different logins are on the same server (Closes: #586904).

diff --git a/debian/changelog b/debian/changelog
index d29705d24d3a2c8bb63adfba0450d5298a052e3f..037dfa7bd06c5660f6c459bf68c9cb971a35e2a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.26~exp8) experimental; urgency=low
+
+  * methods/ftp.h:
+    - Handle different logins are on the same server (Closes: #586904).
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 24 Jun 2010 10:56:39 +0200
+

 apt (0.7.26~exp7) experimental; urgency=low
 
   * apt-pkg/cachefile.h:
 apt (0.7.26~exp7) experimental; urgency=low
 
   * apt-pkg/cachefile.h:

diff --git a/methods/ftp.h b/methods/ftp.h
index 1bcea41b6829d09299c963bf8da2222aa19cb3cb..d7f1f7fbece776cb0bfba3febbcf4fbc44da0384 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -40,7 +40,7 @@ class FTPConn
    
    public:
 
    
    public:
 

-   bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
+   bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port && Other.User == ServerName.User && Other.Password == ServerName.Password; };

    
    // Raw connection IO
    bool ReadResp(unsigned int &Ret,string &Text);
    
    // Raw connection IO
    bool ReadResp(unsigned int &Ret,string &Text);