From 35f1ec58e63170e10595d92a1de6809da439c0af Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sun, 5 May 2019 16:00:26 +0000
Subject: We can not put anything into the environment that we delete or modify
 afterwards.

---
 defaults/src/vespa/defaults.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'defaults')

diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp
index 428dcfa6ce5..24149e3e4c8 100644
--- a/defaults/src/vespa/defaults.cpp
+++ b/defaults/src/vespa/defaults.cpp
@@ -24,6 +24,7 @@ int defaultPortConfigServerRpc = 0;
 int defaultPortConfigServerHttp = 0;
 int defaultPortConfigProxyRpc = 0;
 const char *defaultConfigServers = 0;
+std::string VESPA_HOME_ENV = "VESPA_HOME=";
 
 std::atomic<bool> initialized(false);
 
@@ -194,10 +195,8 @@ Defaults::bootstrap(const char *argv0)
                    path.resize(slash);
                }
             }
-            std::string setting = "VESPA_HOME";
-            setting.append("=");
-            setting.append(path);
-            putenv(&setting[0]);
+            VESPA_HOME_ENV.append(path);
+            putenv(&VESPA_HOME_ENV[0]);
         }
     }
     initialized = false;
-- 
cgit v1.2.3