From 1b9aefa394a57dabe38e0658a3b612e962d3fc5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 12 Nov 2015 23:15:18 +0100
Subject: download: Always use AI_ADDRCONFIG when resolving host names.

* guix/build/download.scm (open-socket-for-uri): Always pass
  AI_ADDRCONFIG to 'getaddrinfo' as recommended in the fine Guile
  manual.
* guix/ftp-client.scm (ftp-open): Ditto.
---
 guix/ftp-client.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'guix/ftp-client.scm')

diff --git a/guix/ftp-client.scm b/guix/ftp-client.scm
index 9ea878a145..f02d460061 100644
--- a/guix/ftp-client.scm
+++ b/guix/ftp-client.scm
@@ -134,7 +134,9 @@ TIMEOUT, an ETIMEDOUT error is raised."
   (define addresses
     (getaddrinfo host
                  (if (number? port) (number->string port) port)
-                 (if (number? port) AI_NUMERICSERV 0)))
+                 (if (number? port)
+                     (logior AI_ADDRCONFIG AI_NUMERICSERV)
+                     AI_ADDRCONFIG)))
 
   (let loop ((addresses addresses))
     (let* ((ai (car addresses))
-- 
cgit v1.2.3