kubernetes-client/c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct check for getenv()/secure_getenv()

Browse Source
This commit is contained in:
Ahmed Yarub Hani Al Nuaimi
2023-02-08 19:22:15 -03:00
parent 18431c6194
commit c8c27b1da6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kubernetes/ConfigureChecks.cmake
View File

@@ -2,3 +2,4 @@ include(CheckFunctionExists)
check_function_exists(strndup HAVE_STRNDUP)
check_function_exists(secure_getenv HAVE_SECURE_GETENV)
check_function_exists(getenv HAVE_GETENV)

13
kubernetes/config/kube_config.c
View File

@@ -111,19 +111,18 @@ static char *getWorkingConfigFile(const char *configFileNamePassedIn)
configFileName = strdup(configFileNamePassedIn);
} else {
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) || !defined(HAVE_SECURE_GETENV)
kubeconfig_env = getenv(ENV_KUBECONFIG);
#elif __linux || defined(__EMSCRIPTEN__)
#if defined(HAVE_SECURE_GETENV)
kubeconfig_env = secure_getenv(ENV_KUBECONFIG);
#elif defined(HAVE_GETENV)
kubeconfig_env = getenv(ENV_KUBECONFIG);
#endif
if (kubeconfig_env) {
configFileName = strdup(kubeconfig_env);
} else {
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) || !defined(HAVE_SECURE_GETENV)
homedir_env = getenv(ENV_HOME);
#elif __linux || defined(__EMSCRIPTEN__)
#if defined(HAVE_SECURE_GETENV)
homedir_env = secure_getenv(ENV_HOME);
#else
#elif defined(HAVE_GETENV)
homedir_env = getenv(ENV_HOME);
#endif
if (homedir_env) {
int configFileNameSize = strlen(homedir_env) + strlen(KUBE_CONFIG_DEFAULT_LOCATION) + 1;