summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2017-07-07 21:59:01 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2017-07-26 19:09:04 +0200
commit6291fa81da6ed4c32d0dde33fa559cd155faff11 (patch)
tree927f08cbd37bbce8057213205ed54215e16e04fa /methods
parentea408c560ed85bb4ef7cf8f72f8463653501332c (diff)
lookup login info for proxies in auth.conf
On HTTP Connect we since recently look into the auth.conf file for login information, so we should really look for all proxies into the file as the argument is the same as for sources entries and it is easier to document (especially as the manpage already mentions it as supported).
Diffstat (limited to 'methods')
-rw-r--r--methods/basehttp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/methods/basehttp.cc b/methods/basehttp.cc
index 03409a8d4..1a3566479 100644
--- a/methods/basehttp.cc
+++ b/methods/basehttp.cc
@@ -847,6 +847,7 @@ bool BaseHttpMethod::Configuration(std::string Message) /*{{{*/
/*}}}*/
bool BaseHttpMethod::AddProxyAuth(URI &Proxy, URI const &Server) /*{{{*/
{
+ MaybeAddAuthTo(Proxy);
if (std::find(methodNames.begin(), methodNames.end(), "tor") != methodNames.end() &&
Proxy.User == "apt-transport-tor" && Proxy.Password.empty())
{
@@ -857,7 +858,6 @@ bool BaseHttpMethod::AddProxyAuth(URI &Proxy, URI const &Server) /*{{{*/
else
Proxy.Password = std::move(pass);
}
- // FIXME: should we support auth.conf for proxies?
return true;
}
/*}}}*/