Skip to content

Commit c8c27b1

Browse files
author
Ahmed Yarub Hani Al Nuaimi
committed
Correct check for getenv()/secure_getenv()
1 parent 18431c6 commit c8c27b1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

kubernetes/ConfigureChecks.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ include(CheckFunctionExists)
22

33
check_function_exists(strndup HAVE_STRNDUP)
44
check_function_exists(secure_getenv HAVE_SECURE_GETENV)
5+
check_function_exists(getenv HAVE_GETENV)

kubernetes/config/kube_config.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,18 @@ static char *getWorkingConfigFile(const char *configFileNamePassedIn)
111111
configFileName = strdup(configFileNamePassedIn);
112112
} else {
113113

114-
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) || !defined(HAVE_SECURE_GETENV)
115-
kubeconfig_env = getenv(ENV_KUBECONFIG);
116-
#elif __linux || defined(__EMSCRIPTEN__)
114+
#if defined(HAVE_SECURE_GETENV)
117115
kubeconfig_env = secure_getenv(ENV_KUBECONFIG);
116+
#elif defined(HAVE_GETENV)
117+
kubeconfig_env = getenv(ENV_KUBECONFIG);
118118
#endif
119119
if (kubeconfig_env) {
120120
configFileName = strdup(kubeconfig_env);
121121
} else {
122-
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__APPLE__) || !defined(HAVE_SECURE_GETENV)
123-
homedir_env = getenv(ENV_HOME);
124-
#elif __linux || defined(__EMSCRIPTEN__)
122+
#if defined(HAVE_SECURE_GETENV)
125123
homedir_env = secure_getenv(ENV_HOME);
126-
#else
124+
#elif defined(HAVE_GETENV)
125+
homedir_env = getenv(ENV_HOME);
127126
#endif
128127
if (homedir_env) {
129128
int configFileNameSize = strlen(homedir_env) + strlen(KUBE_CONFIG_DEFAULT_LOCATION) + 1;

0 commit comments

Comments
 (0)