X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/945d2a8aeecf844137843265e72d7991f77c3353..14e8d0257c83938612afb2981fc72428c9c7f59b:/methods/connect.cc?ds=sidebyside

diff --git a/methods/connect.cc b/methods/connect.cc
index 3573d3cbf..fc7a72ee9 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -17,6 +17,7 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/acquire-method.h>
+#include <apt-pkg/configuration.h>
 
 #include <stdio.h>
 #include <errno.h>
@@ -167,6 +168,13 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
       Hints.ai_flags = AI_ADDRCONFIG;
       Hints.ai_protocol = 0;
       
+      if(_config->FindB("Acquire::ForceIPv4", false) == true)
+         Hints.ai_family = AF_INET;
+      else if(_config->FindB("Acquire::ForceIPv6", false) == true)
+         Hints.ai_family = AF_INET6;
+      else
+         Hints.ai_family = AF_UNSPEC;
+
       // if we couldn't resolve the host before, we don't try now
       if(bad_addr.find(Host) != bad_addr.end()) 
 	 return _error->Error(_("Could not resolve '%s'"),Host.c_str());
@@ -198,8 +206,8 @@ bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
 				    Host.c_str());
 	    }
 	    if (Res == EAI_SYSTEM)
-	       return _error->Error(_("System error resolving '%s:%s' (%s)"),
-				    Host.c_str(),ServStr,strerror(errno));
+	       return _error->Errno("getaddrinfo", _("System error resolving '%s:%s'"),
+                                      Host.c_str(),ServStr);
 	    return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
 				 Host.c_str(),ServStr,Res,gai_strerror(Res));
 	 }