Fix utils not detecting symbols and add strtok_r

While adding HAVE_STRTOK_R I noticed utils.c was not including config.h, which
also made the HAVE_STRNCPY test fail, so fix it.

Author: haesbaert

kubernetes/ConfigureChecks.cmake

@@ -3,3 +3,4 @@ include(CheckSymbolExists)
 check_symbol_exists(strndup "string.h" HAVE_STRNDUP)
 check_symbol_exists(secure_getenv "stdlib.h" HAVE_SECURE_GETENV)
 check_symbol_exists(getenv "stdlib.h" HAVE_GETENV)
+check_symbol_exists(strtok_r "string.h" HAVE_STRTOK_R)

kubernetes/config.h.in

@@ -1,3 +1,4 @@
 #cmakedefine HAVE_STRNDUP
 #cmakedefine HAVE_SECURE_GETENV
-#cmakedefine HAVE_GETENV
+#cmakedefine HAVE_GETENV
+#cmakedefine HAVE_STRTOK_R

kubernetes/config/authn_plugin/plugins/oidc/libkubernetes_oidc.c

@@ -29,7 +29,6 @@
 static time_t get_token_expiration_time(const char *token_string)
 {
     static char fname[] = "get_token_expiration_time()";
-    char *last;
 
     time_t expiration_time = 0;
 
@@ -42,6 +41,7 @@ static time_t get_token_expiration_time(const char *token_string)
     }
 
     char *p = NULL;
+    char *last = NULL;
     p = strtok_r(dup_token_string, OIDC_ID_TOKEN_DELIM, &last);  /* jwt header */
     if (!p) {
         fprintf(stderr, "%s: The token <%s> is not a valid JWT token.\n", fname, token_string);

kubernetes/include/utils.h

@@ -9,6 +9,10 @@ extern "C" {
 char *strndup(const char *s, size_t n);
 #endif /* ! HAVE_STRNDUP */
 
+#if !defined(HAVE_STRTOK_R)
+char *strtok_r(char *str, const char *delim, char **saveptr);
+#endif /* ! HAVE_STRTOK_R */
+
 #ifdef  __cplusplus
 }
 #endif

kubernetes/src/utils.c

@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "../include/utils.h"
 #include <string.h>
+#include "config.h"
 
 // based on https://github.com/libssh/libssh-mirror/commit/247983e9820fd264cb5a59c14cc12846c028bd08#diff-744295d01685fa411dbfd78679ea20b51dfa4ac7d2d722df53f3d86d728493f8
 #if !defined(HAVE_STRNDUP)
@@ -22,4 +23,11 @@ char *strndup(const char *s, size_t n)
 
     return x;
 }
-#endif /* ! HAVE_STRNDUP */
+#endif /* ! HAVE_STRNDUP */
+
+#if !defined(HAVE_STRTOK_R)
+char *strtok_r(char *str, const char *delim, char **saveptr)
+{
+    return strtok(str, delim);
+}
+#endif /* ! HAVE_STRTOK_R */

kubernetes/watch/watch_util.c

@@ -10,7 +10,7 @@
 
 static int wu_convert_to_json_array(list_t * json_array, const char *json_string)
 {
-    char *last;
+    char *last = NULL;
 
     if (!json_string || '\0' == json_string[0] || !json_array) {
         return -1;