summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-11-17 09:38:01 +0100
committerLudovic Courtès <ludo@gnu.org>2015-11-17 09:44:52 +0100
commitb7f4677999f9ad9f457088b69e1dc86e9664ec76 (patch)
tree01968ee8ffca26fe60b2fc7ac2e5578659e41ead
parent3279b7ec47ad33911309d3b58eea60002229458e (diff)
downloadpatches-b7f4677999f9ad9f457088b69e1dc86e9664ec76.tar
patches-b7f4677999f9ad9f457088b69e1dc86e9664ec76.tar.gz
ftp-client: Restrict to TCP/IP connections.
Fixes <http://bugs.gnu.org/21925>. Regression introduced in 279ec1d. Reported by Chris Marusich <cmmarusich@gmail.com>. * guix/ftp-client.scm (ftp-open): Restrict sockets to SOCK_STREAM/IPPROTO_IP.
-rw-r--r--guix/ftp-client.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/ftp-client.scm b/guix/ftp-client.scm
index f02d460061..e76f08afd4 100644
--- a/guix/ftp-client.scm
+++ b/guix/ftp-client.scm
@@ -140,8 +140,9 @@ TIMEOUT, an ETIMEDOUT error is raised."
(let loop ((addresses addresses))
(let* ((ai (car addresses))
- (s (socket (addrinfo:fam ai) SOCK_STREAM ;TCP only
- (addrinfo:protocol ai))))
+ (s (socket (addrinfo:fam ai)
+ ;; TCP/IP only
+ SOCK_STREAM IPPROTO_IP)))
(catch 'system-error
(lambda ()