summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-10-16 15:42:05 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-10-16 15:42:05 +0200
commit1de1f70383ea2d44147ccaceff280fd70faf4c81 (patch)
tree198f17cfbacda989495923a6f34aed64313a86da /methods
parent592b78001c381f9cca6f20d8d1d47696bb98c0d1 (diff)
add maybe_add_auth for ftp as well
Diffstat (limited to 'methods')
-rw-r--r--methods/ftp.cc4
-rw-r--r--methods/http.cc2
-rw-r--r--methods/https.cc2
3 files changed, 5 insertions, 3 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc
index c91600ad5..eb398666f 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -982,7 +982,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)
{
diff --git a/methods/http.cc b/methods/http.cc
index 6bfe80baf..50478b44c 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -725,9 +725,9 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Proxy-Authorization: Basic ") +
Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
+ maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
if (Uri.User.empty() == false || Uri.Password.empty() == false)
{
- maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
}
diff --git a/methods/https.cc b/methods/https.cc
index a86c78029..075d655b7 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -127,7 +127,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_reset(curl);
SetupProxy();
- maybe_add_auth (Uri, _config->FindFile("Dir::ETc::netrc"));
+ maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
// callbacks
curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str());