net: fix EAI_BADFLAGS error on freebsd
R=rsc
CC=golang-dev
https://golang.org/cl/4442072
diff --git a/src/pkg/net/Makefile b/src/pkg/net/Makefile
index a14027e..221871c 100644
--- a/src/pkg/net/Makefile
+++ b/src/pkg/net/Makefile
@@ -31,6 +31,7 @@
port.go\
CGOFILES_freebsd=\
+ cgo_bsd.go\
cgo_unix.go\
GOFILES_darwin=\
@@ -42,6 +43,7 @@
port.go\
CGOFILES_darwin=\
+ cgo_bsd.go\
cgo_unix.go\
GOFILES_linux=\
@@ -57,6 +59,7 @@
GOFILES_linux+=cgo_stub.go
else
CGOFILES_linux=\
+ cgo_linux.go\
cgo_unix.go
endif
diff --git a/src/pkg/net/cgo_bsd.go b/src/pkg/net/cgo_bsd.go
new file mode 100644
index 0000000..4984df4
--- /dev/null
+++ b/src/pkg/net/cgo_bsd.go
@@ -0,0 +1,14 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package net
+
+/*
+#include <netdb.h>
+*/
+import "C"
+
+func cgoAddrInfoMask() C.int {
+ return C.AI_MASK
+}
diff --git a/src/pkg/net/cgo_linux.go b/src/pkg/net/cgo_linux.go
new file mode 100644
index 0000000..8d4413d
--- /dev/null
+++ b/src/pkg/net/cgo_linux.go
@@ -0,0 +1,14 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package net
+
+/*
+#include <netdb.h>
+*/
+import "C"
+
+func cgoAddrInfoMask() C.int {
+ return C.AI_CANONNAME | C.AI_V4MAPPED | C.AI_ALL
+}
diff --git a/src/pkg/net/cgo_unix.go b/src/pkg/net/cgo_unix.go
index fdf061c..a3711d6 100644
--- a/src/pkg/net/cgo_unix.go
+++ b/src/pkg/net/cgo_unix.go
@@ -86,7 +86,7 @@
// and similarly for IPv6), but in practice setting it causes
// getaddrinfo to return the wrong canonical name on Linux.
// So definitely leave it out.
- hints.ai_flags = C.AI_ALL | C.AI_V4MAPPED | C.AI_CANONNAME
+ hints.ai_flags = (C.AI_ALL | C.AI_V4MAPPED | C.AI_CANONNAME) & cgoAddrInfoMask()
h := C.CString(name)
defer C.free(unsafe.Pointer(h))
