From e6e74f987f0fa284d220432d426eb965269a97d6 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Wed, 1 Feb 2017 13:37:34 +0100 Subject: Add netrc-file support --- src/libstore/download.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/libstore/download.cc') diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 074e0ca6642a..8f2387b63253 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -230,6 +230,11 @@ struct CurlDownloader : public Downloader curl_easy_setopt(req, CURLOPT_SSL_VERIFYHOST, 0); } + Path netrcFile = settings.get("netrc-file", + (format("%1%/%2%") % settings.nixConfDir % "netrc").str()); + curl_easy_setopt(req, CURLOPT_NETRC_FILE, netrcFile.c_str()); + curl_easy_setopt(req, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); + result.data = std::make_shared(); } -- cgit 1.4.1 From e2257d4eeb3f75bac57d9cb77c9ce06b702de050 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Thu, 9 Feb 2017 18:16:09 +0100 Subject: Documentation. --- src/libstore/download.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/libstore/download.cc') diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 8f2387b63253..b2adc154818e 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -230,8 +230,11 @@ struct CurlDownloader : public Downloader curl_easy_setopt(req, CURLOPT_SSL_VERIFYHOST, 0); } + /* If no file exist in the specified path, curl continues to work + * anyway as if netrc support was disabled. */ Path netrcFile = settings.get("netrc-file", (format("%1%/%2%") % settings.nixConfDir % "netrc").str()); + /* Curl copies the given C string, so the following call is safe. */ curl_easy_setopt(req, CURLOPT_NETRC_FILE, netrcFile.c_str()); curl_easy_setopt(req, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); -- cgit 1.4.1