apply various suggestions made by cppcheck

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 171622fa570d31a2813dd2f5be4d4ee259e45f2e..b4cd17ca867a7725a9a0c27e9268c5926ee72a7c 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -164,7 +164,12 @@ static bool ConnectToHostname(std::string const &Host, int const Port,
       struct addrinfo Hints;
       memset(&Hints,0,sizeof(Hints));
       Hints.ai_socktype = SOCK_STREAM;
-      Hints.ai_flags = AI_ADDRCONFIG;
+      Hints.ai_flags = 0;
+      // see getaddrinfo(3): only return address if system has such a address configured
+      // useful if system is ipv4 only, to not get ipv6, but that fails if the system has
+      // no address configured: e.g. offline and trying to connect to localhost.
+      if (_config->FindB("Acquire::Connect::AddrConfig", true) == true)
+        Hints.ai_flags |= AI_ADDRCONFIG;
       Hints.ai_protocol = 0;
       
       if(_config->FindB("Acquire::ForceIPv4", false) == true)