summaryrefslogtreecommitdiff
path: root/methods/ftp.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2009-12-10 23:05:23 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2009-12-10 23:05:23 +0100
commitf932cd7c75cd7b0da99c97064f8d112075ccd7f5 (patch)
tree6018c4ae9c4f4c3d2cd0abb8b3f0fb7b4094524b /methods/ftp.cc
parentc6474fb6ff482b0457674986a82afab0a3749af2 (diff)
parent43be0ac4b37f3a82ae4a16e473c3d8e44637ce1b (diff)
merge with lp:~mvo/apt/debian-sid : move all my ABI break changes
to the "new" 0.7.26 version
Diffstat (limited to 'methods/ftp.cc')
-rw-r--r--methods/ftp.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc
index c91600ad5..3e1725823 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -19,6 +19,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -982,7 +983,9 @@ bool FtpMethod::Fetch(FetchItem *Itm)
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)
{