diff options
| author | Ian Lance Taylor <iant@google.com> | 2014-06-04 23:15:33 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-04 23:15:33 +0000 |
| commit | bae90c989cb020d17a24919ec84c0b8dd2fae2da (patch) | |
| tree | 89766166feb4ceca2d983169c5360e3f6f521b12 /libgo/go/net/dnsclient_unix.go | |
| parent | 82b3da6a714493644a4333bfd8205e3341ed3b8e (diff) | |
libgo: Merge from revision 18783:00cce3a34d7e of master library.
This revision was committed January 7, 2014. The next
revision deleted runtime/mfinal.c. That will be done in a
subsequent merge.
This merge changes type descriptors to add a zero field,
pointing to a zero value for that type. This is implemented
as a common variable.
* go-gcc.cc (Gcc_backend::implicit_variable): Add is_common and
alignment parameters. Permit init parameter to be NULL.
From-SVN: r211249
Diffstat (limited to 'libgo/go/net/dnsclient_unix.go')
| -rw-r--r-- | libgo/go/net/dnsclient_unix.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libgo/go/net/dnsclient_unix.go b/libgo/go/net/dnsclient_unix.go index 16cf420dcdb..a30c9a73d7e 100644 --- a/libgo/go/net/dnsclient_unix.go +++ b/libgo/go/net/dnsclient_unix.go @@ -159,7 +159,8 @@ func convertRR_AAAA(records []dnsRR) []IP { var cfg *dnsConfig var dnserr error -func loadConfig() { cfg, dnserr = dnsReadConfig() } +// Assume dns config file is /etc/resolv.conf here +func loadConfig() { cfg, dnserr = dnsReadConfig("/etc/resolv.conf") } var onceLoadConfig sync.Once |