summaryrefslogtreecommitdiffstats
path: root/defaults
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-05-05 16:00:26 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-05-05 16:00:26 +0000
commit35f1ec58e63170e10595d92a1de6809da439c0af (patch)
tree2cf90bfb5e74b9ae1083af81a5846112317d252f /defaults
parent2553d540126b74df7b19a30476b1dfcd744f9b0c (diff)
We can not put anything into the environment that we delete or modify afterwards.
Diffstat (limited to 'defaults')
-rw-r--r--defaults/src/vespa/defaults.cpp7
1 files changed, 3 insertions, 4 deletions
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;