aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-03-06 14:57:08 +0100
committerRaimo Niskanen <[email protected]>2018-03-06 14:57:08 +0100
commitf59026a57ccdfe4e462cbab9b97e9cd377dd5bdb (patch)
treebcb8c3e1f96b995797a0c5282117f35f8f9d09e4 /erts/etc/common
parentf529c3a4d5add57c2d65114781d1f3c4f96d2a7c (diff)
parent6a4fb088b97a118bd1dcc1a544578f9fabc10c25 (diff)
downloadotp-f59026a57ccdfe4e462cbab9b97e9cd377dd5bdb.tar.gz
otp-f59026a57ccdfe4e462cbab9b97e9cd377dd5bdb.tar.bz2
otp-f59026a57ccdfe4e462cbab9b97e9cd377dd5bdb.zip
Merge branch 'raimo/stop-encouraging-v4-mapped/ERL-503/OTP-13716'
* raimo/stop-encouraging-v4-mapped/ERL-503/OTP-13716: Stop translating V4MAPPED addresses Stop returning V4MAPPED addresses Implement function for IPv4-mapped IPv6 addresses
Diffstat (limited to 'erts/etc/common')
-rw-r--r--erts/etc/common/inet_gethost.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index b746487668..4fc7a93348 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1998-2017. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2018. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1770,7 +1770,7 @@ static int worker_loop(void)
}
#elif defined(HAVE_GETIPNODEBYNAME) /*#ifdef HAVE_GETADDRINFO */
DEBUGF(5,("Starting getipnodebyname(%s)",data));
- he = getipnodebyname(data, AF_INET6, AI_DEFAULT, &error_num);
+ he = getipnodebyname(data, AF_INET6, 0, &error_num);
if (he) {
free_he = 1;
error_num = 0;