Mercurial > hg > release > icedtea7-forest-2.3 > jdk

changeset 5385:fe015b0bd239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7166687: InetAddress.getLocalHost().getHostName() returns FQDN Reviewed-by: chegar
author robm
date Mon, 07 May 2012 11:33:49 -0700
parents c91e36369a9f
children 16db69d35e28
files src/solaris/native/java/net/Inet6AddressImpl.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/native/java/net/Inet6AddressImpl.c	Mon May 07 01:22:07 2012 -0700
+++ b/src/solaris/native/java/net/Inet6AddressImpl.c	Mon May 07 11:33:49 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@
     } else {
         // ensure null-terminated
         hostname[NI_MAXHOST] = '\0';
-#if defined(__linux__) && defined(_ALLBSD_SOURCE)
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
         /* On Linux/FreeBSD gethostname() says "host.domain.sun.com".  On
          * Solaris gethostname() says "host", so extra work is needed.
          */