Minor changes

Author: anchitj

src/rdkafka_conf.c

@@ -1081,37 +1081,44 @@ static const struct rd_kafka_property rd_kafka_properties[] = {
     {_RK_GLOBAL | _RK_SENSITIVE, "sasl.oauthbearer.private.key.id", _RK_C_STR,
      _RK(sasl.oauthbearer.private_key_id),
      "Private key id. "
-     "Only used when `sasl.oauthbearer.method` is set to \"jwt\".",
+     "Only used when `sasl.oauthbearer.method` is set to \"oidc\" and JWT "
+     "grant type is needed.",
      _UNSUPPORTED_OIDC},
     {_RK_GLOBAL | _RK_SENSITIVE, "sasl.oauthbearer.private.key.secret",
      _RK_C_STR, _RK(sasl.oauthbearer.private_key_secret),
      "Private key id. "
-     "Only used when `sasl.oauthbearer.method` is set to \"jwt\".",
+     "Only used when `sasl.oauthbearer.method` is set to \"oidc\" and JWT "
+     "grant type is needed.",
      _UNSUPPORTED_OIDC},
     {_RK_GLOBAL, "sasl.oauthbearer.token.signing.algorithm", _RK_C_STR,
      _RK(sasl.oauthbearer.token_signing_algorithm),
      "token_signing_algorithm. "
-     "Only used when `sasl.oauthbearer.method` is set to \"jwt\".",
+     "Only used when `sasl.oauthbearer.method` is set to \"oidc\" and JWT "
+     "grant type is needed.",
      _UNSUPPORTED_OIDC},
     {_RK_GLOBAL, "sasl.oauthbearer.token.subject", _RK_C_STR,
      _RK(sasl.oauthbearer.token_subject),
      "token_signing_algorithm. "
-     "Only used when `sasl.oauthbearer.method` is set to \"jwt\".",
+     "Only used when `sasl.oauthbearer.method` is set to \"oidc\" and JWT "
+     "grant type is needed.",
      _UNSUPPORTED_OIDC},
     {_RK_GLOBAL, "sasl.oauthbearer.token.issuer", _RK_C_STR,
      _RK(sasl.oauthbearer.token_issuer),
      "token_issuer. "
-     "Only used when `sasl.oauthbearer.method` is set to \"jwt\".",
+     "Only used when `sasl.oauthbearer.method` is set to \"oidc\" and JWT "
+     "grant type is needed.",
      _UNSUPPORTED_OIDC},
     {_RK_GLOBAL, "sasl.oauthbearer.token_audience", _RK_C_STR,
      _RK(sasl.oauthbearer.token_audience),
      "token_audience. "
-     "Only used when `sasl.oauthbearer.method` is set to \"jwt\".",
+     "Only used when `sasl.oauthbearer.method` is set to \"oidc\" and JWT "
+     "grant type is needed.",
      _UNSUPPORTED_OIDC},
     {_RK_GLOBAL, "sasl.oauthbearer.token_target_audience", _RK_C_STR,
      _RK(sasl.oauthbearer.token_target_audience),
      "token_target_audience. "
-     "Only used when `sasl.oauthbearer.method` is set to \"jwt\".",
+     "Only used when `sasl.oauthbearer.method` is set to \"oidc\" and JWT "
+     "grant type is needed.",
      _UNSUPPORTED_OIDC},
 
 

src/rdkafka_sasl_oauthbearer_oidc.c

@@ -327,10 +327,9 @@ static char *rd_kafka_create_jwt_assertion(const char *key_id,
                     target_audience);
 
         /* 3. Base64Url-encode header and payload */
-        encoded_header  = rd_base64url_encode((unsigned char *)header_json,
-                                             strlen(header_json));
-        encoded_payload = rd_base64url_encode((unsigned char *)payload_json,
-                                              strlen(payload_json));
+        encoded_header = rd_base64url_encode(header_json, strlen(header_json));
+        encoded_payload =
+            rd_base64url_encode(payload_json, strlen(payload_json));
         if (!encoded_header || !encoded_payload)
                 goto cleanup;
 
@@ -518,7 +517,6 @@ void rd_kafka_jwt_refresh_cb(rd_kafka_t *rk,
         char *formatted_token      = NULL;
         char set_token_errstr[512];
         double exp                     = 0;
-        const char *principal_name     = NULL;
         char **extensions              = NULL;
         char **extension_key_value     = NULL;
         size_t extension_key_value_cnt = 0;