add maybe_add_auth for ftp as well

diff --git a/methods/ftp.cc b/methods/ftp.cc
index c91600ad5388f7cc675922ce731e37ad43faf59e..eb398666f322bccd6eca2dde1287299f5b304efa 100644 (file)
--- 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;
    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)
    {

diff --git a/methods/http.cc b/methods/http.cc
index 6bfe80baf0a4c1fe76f1331d4ae1595249420ee7..50478b44c846e8ffa6a16a8baff5180d84ffea10 100644 (file)
--- 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";
 
       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)
    {
    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";
    }
       Req += string("Authorization: Basic ") + 
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }

diff --git a/methods/https.cc b/methods/https.cc
index a86c78029b29e33cb75dcdbb68213d4878d34787..075d655b794355d98d8057e8727ee193cd10f103 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -127,7 +127,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_reset(curl);
    SetupProxy();
 
    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());
 
    // callbacks
    curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str());