code: declare enum members as int

so they can be initialized to OIDC_CONFIG_POS_INT_UNSET without warning

Signed-off-by: Hans Zandbelt <[email protected]>

Author: zandbelt

ChangeLog

@@ -1,5 +1,6 @@
 12/16/2024
 - http: report errors when curl_easy_setopt fails and improve macro usage
+- code: declare enum members as int so they can be set to OIDC_CONFIG_POS_INT_UNSET without warning
 
 12/15/2024
 - add Coverity Github action

src/cfg/cfg_int.h

@@ -150,12 +150,12 @@ struct oidc_cfg_t {
 	int session_cookie_chunk_size;
 	char *cookie_domain;
 	int cookie_http_only;
-	oidc_samesite_cookie_t cookie_same_site;
+	int cookie_same_site;
 
 	int state_timeout;
 	int max_number_of_state_cookies;
 	int delete_oldest_state_cookies;
-	oidc_state_input_hdrs_t state_input_headers;
+	int state_input_headers;
 
 	int session_inactivity_timeout;
 	int provider_metadata_refresh_interval;
@@ -181,9 +181,9 @@ struct oidc_cfg_t {
 	apr_hash_t *redirect_urls_allowed;
 	char *ca_bundle_path;
 	char *logout_x_frame_options;
-	oidc_hdr_x_forwarded_t x_forwarded_headers;
-	oidc_on_error_action_t action_on_userinfo_error;
-	oidc_trace_parent_t trace_parent;
+	int x_forwarded_headers;
+	int action_on_userinfo_error;
+	int trace_parent;
 
 	apr_hash_t *metrics_hook_data;
 	char *metrics_path;

src/cfg/dir.c

@@ -53,14 +53,14 @@ struct oidc_dir_cfg_t {
 	char *cookie_path;
 	char *cookie;
 	char *authn_header;
-	oidc_unauth_action_t unauth_action;
-	oidc_unautz_action_t unautz_action;
+	int unauth_action;
+	int unautz_action;
 	char *unauthz_arg;
 	apr_array_header_t *pass_cookies;
 	apr_array_header_t *strip_cookies;
-	oidc_appinfo_pass_in_t pass_info_in;
-	oidc_appinfo_encoding_t pass_info_encoding;
-	oidc_oauth_accept_token_in_t oauth_accept_token_in;
+	int pass_info_in;
+	int pass_info_encoding;
+	int oauth_accept_token_in;
 	apr_hash_t *oauth_accept_token_options;
 	int oauth_token_introspect_interval;
 	int preserve_post;
@@ -71,11 +71,11 @@ struct oidc_dir_cfg_t {
 	oidc_apr_expr_t *unauth_expression;
 	oidc_apr_expr_t *userinfo_claims_expr;
 	int refresh_access_token_before_expiry;
-	oidc_on_error_action_t action_on_error_refresh;
-	oidc_on_error_action_t action_on_userinfo_refresh;
+	int action_on_error_refresh;
+	int action_on_userinfo_refresh;
 	char *state_cookie_prefix;
 	apr_array_header_t *pass_userinfo_as;
-	oidc_pass_idtoken_as_t pass_idtoken_as;
+	int pass_idtoken_as;
 };
 
 #define OIDC_PASS_ID_TOKEN_AS_CLAIMS_STR "claims"
@@ -422,7 +422,8 @@ const char *oidc_cmd_dir_refresh_access_token_before_expiry_set(cmd_parms *cmd,
 		goto end;
 
 	if (arg2)
-		rv = oidc_cfg_parse_action_on_error_refresh_as(cmd->pool, arg2, &dir_cfg->action_on_error_refresh);
+		rv = oidc_cfg_parse_action_on_error_refresh_as(
+		    cmd->pool, arg2, (oidc_on_error_action_t *)&dir_cfg->action_on_error_refresh);
 
 end:
 

src/cfg/provider.c

@@ -632,7 +632,8 @@ const char *oidc_cmd_provider_userinfo_refresh_interval_set(cmd_parms *cmd, void
 	if (rv == NULL)
 		rv = oidc_cfg_provider_userinfo_refresh_interval_set(cmd->pool, cfg->provider, v);
 	if ((rv == NULL) && (arg2))
-		rv = oidc_cfg_parse_action_on_error_refresh_as(cmd->pool, arg2, &cfg->action_on_userinfo_error);
+		rv = oidc_cfg_parse_action_on_error_refresh_as(
+		    cmd->pool, arg2, (oidc_on_error_action_t *)&cfg->action_on_userinfo_error);
 	return OIDC_CONFIG_DIR_RV(cmd, rv);
 }