fix accepting custom cookie names in OIDCOAuthAcceptTokenAs

zandbelt · zandbelt · commit f7beb71a9a86 · 2024-09-09T08:48:46.000+02:00
i.e. allow for cookie:<name>; see #1261; thanks @bbartke bump to 2.4.16.4rc0 Signed-off-by: Hans Zandbelt <hans.zandbelt@openidc.com>
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+09/09/2024
+- fix accepting custom cookie names in OIDCOAuthAcceptTokenAs cookie:<name>; see #1261; thanks @bbartke
+- bump to 2.4.16.4rc0
+
 09/06/2024
 - allow overriding globally set OIDCCacheType back to shm in vhosts
 - correct typo in child initialization routines when using multiple vhosts; closes #1208; thanks @studersi
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mod_auth_openidc],[2.4.16.3],[hans.zandbelt@openidc.com])
+AC_INIT([mod_auth_openidc],[2.4.16.4rc0],[hans.zandbelt@openidc.com])
 
 AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())
 
diff --git a/src/cfg/dir.c b/src/cfg/dir.c
@@ -225,7 +225,7 @@ const char *oidc_cmd_dir_accept_oauth_token_in_set(cmd_parms *cmd, void *m, cons
 	}
 
 	rv = oidc_cfg_parse_option(cmd->pool, oidc_oauth_accept_token_in_options,
-				   OIDC_CFG_OPTIONS_SIZE(oidc_oauth_accept_token_in_options), arg, &v);
+				   OIDC_CFG_OPTIONS_SIZE(oidc_oauth_accept_token_in_options), s, &v);
 	if (rv != NULL)
 		return OIDC_CONFIG_DIR_RV(cmd, rv);
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AC_INIT([mod_auth_openidc],[2.4.16.3],[hans.zandbelt@openidc.com])`
	`1`	`+AC_INIT([mod_auth_openidc],[2.4.16.4rc0],[hans.zandbelt@openidc.com])`
`2`	`2`
`3`	`3`	`AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ const char oidc_cmd_dir_accept_oauth_token_in_set(cmd_parms cmd, void *m, cons`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`rv = oidc_cfg_parse_option(cmd->pool, oidc_oauth_accept_token_in_options,`
`228`		`- OIDC_CFG_OPTIONS_SIZE(oidc_oauth_accept_token_in_options), arg, &v);`
	`228`	`+ OIDC_CFG_OPTIONS_SIZE(oidc_oauth_accept_token_in_options), s, &v);`
`229`	`229`	`if (rv != NULL)`
`230`	`230`	`return OIDC_CONFIG_DIR_RV(cmd, rv);`
`231`	`231`