From 04b08da9af0c450d645ab7389d1467308cfc2db8 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Mon, 4 Mar 2013 21:27:36 +0100
Subject: Imported Upstream version 1.1~hg20130304

---
 src/pkg/net/cgo_linux.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/pkg/net/cgo_linux.go')

diff --git a/src/pkg/net/cgo_linux.go b/src/pkg/net/cgo_linux.go
index 8d4413d2d..f6cefa89a 100644
--- a/src/pkg/net/cgo_linux.go
+++ b/src/pkg/net/cgo_linux.go
@@ -9,6 +9,12 @@ package net
 */
 import "C"
 
-func cgoAddrInfoMask() C.int {
+func cgoAddrInfoFlags() C.int {
+	// NOTE(rsc): In theory there are approximately balanced
+	// arguments for and against including AI_ADDRCONFIG
+	// in the flags (it includes IPv4 results only on IPv4 systems,
+	// and similarly for IPv6), but in practice setting it causes
+	// getaddrinfo to return the wrong canonical name on Linux.
+	// So definitely leave it out.
 	return C.AI_CANONNAME | C.AI_V4MAPPED | C.AI_ALL
 }
-- 
cgit v1.2.3