From 9b571a31200ffccad327cefb48944a3b88494bcd Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Fri, 18 Nov 2011 01:52:39 +1100 Subject: [PATCH] syscall: hostname/domainname fix for openbsd Work around a bug that was fixed after OpenBSD 5.0 - a request for kern.hostname or kern.domainname with a nil value for oldp will result in a length of zero being returned. If we hit this case use a length of MAXHOSTNAMELEN (256). R=golang-dev, mikioh.mikioh CC=golang-dev https://golang.org/cl/5408041 --- src/pkg/syscall/syscall_bsd.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pkg/syscall/syscall_bsd.go b/src/pkg/syscall/syscall_bsd.go index 65ac1e08da..163232ad48 100644 --- a/src/pkg/syscall/syscall_bsd.go +++ b/src/pkg/syscall/syscall_bsd.go @@ -559,7 +559,16 @@ func Sysctl(name string) (value string, err error) { return "", err } if n == 0 { - return "", nil + // TODO(jsing): Remove after OpenBSD 5.2 release. + // Work around a bug that was fixed after OpenBSD 5.0. + // The length for kern.hostname and kern.domainname is always + // returned as 0 when a nil value is passed for oldp. + if OS == "openbsd" && (value == "kern.hostname" || value == "kern.domainname") { + // MAXHOSTNAMELEN + n = 256 + } else { + return "", nil + } } // Read into buffer of that size.