use VESPA_HOSTNAME or "localhost" only

2 files changed, 3 insertions, 19 deletions

diff --git a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
index 8a9be7891ae..441773a14c9 100644
--- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
+++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
@@ -55,15 +55,6 @@ public class Defaults {
         if (vespaHostEnv.isPresent() && ! vespaHostEnv.get().trim().isEmpty()) {
             return vespaHostEnv.get().trim();
         }
-        try {
-            Process p = Runtime.getRuntime().exec("hostname");
-            BufferedReader r = new BufferedReader(
-                    new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8));
-            String line = r.readLine();
-            if (line != null && ! line.trim().isEmpty()) {
-                return line;
-            }
-        } catch (java.io.IOException e) {}
         return "localhost";
     }
 
diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp
index 05e621d2dc2..dcb5e38584d 100644
--- a/defaults/src/vespa/defaults.cpp
+++ b/defaults/src/vespa/defaults.cpp
@@ -18,7 +18,6 @@ namespace {
 const char *defaultHome = "/opt/vespa";
 const char *defaultUser = "vespa";
 const char *defaultHost = "localhost";
-char hostbuf[HOST_BUF_SZ];
 int defaultWebServicePort = 8080;
 int defaultPortBase = 19000;
 int defaultPortConfigServerRpc = 19070;
@@ -60,22 +59,16 @@ void findDefaults() {
         }
     }
     env = getenv("VESPA_USER");
-    if (env != NULL) {
-        if (*env != '0' && getpwnam(env) == 0) {
+    if (env != NULL && *env != '\0') {
+        if (getpwnam(env) == 0) {
             fprintf(stderr, "warning\tbad VESPA_USER '%s' (ignored)\n", env);
         } else {
             defaultUser = env;
         }
     }
     env = getenv("VESPA_HOSTNAME");
-    if (env != NULL) {
+    if (env != NULL && *env != '\0') {
         defaultHost = env;
-    } else {
-        int err = gethostname(hostbuf, HOST_BUF_SZ);
-        hostbuf[HOST_BUF_SZ-1] = '\0';
-        if (err == 0 && strlen(hostbuf) > 0 && strlen(hostbuf) < HOST_BUF_SZ-1) {
-            defaultHost = hostbuf;
-        }
     }
     long p = getNumFromEnv("VESPA_WEB_SERVICE_PORT");
     if (p > 0) {