summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2010-06-24 10:57:45 +0200
committerJulian Andres Klode <jak@debian.org>2010-06-24 10:57:45 +0200
commit330463dd2374bd11757c6f2662f279fc31f035a0 (patch)
tree06ccf5f0d56d9f5738f2ce8327a28e636df914df
parent6b2f7a60c3d7d22d1d6b0e300ef526d48ff20048 (diff)
methods/ftp.h: Handle different logins are on the same server (Closes: #586904).
-rw-r--r--debian/changelog7
-rw-r--r--methods/ftp.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d29705d24..037dfa7bd 100644
--- 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:
diff --git a/methods/ftp.h b/methods/ftp.h
index 1bcea41b6..d7f1f7fbe 100644
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -40,7 +40,7 @@ class FTPConn
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);