entrouvert
/
modmellon
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Change am_get_idp() to use providers from LassoServer. 

git-svn-id: https://modmellon.googlecode.com/svn/trunk/mod_mellon2@124 a716ebb1-153a-0410-b759-cfb97c6a1b53
This commit is contained in:
olavmrk 2011-05-18 10:48:57 +00:00
parent 8a4748cd64
commit fbd59b5a1d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
auth_mellon_handler.c
View File

@ -344,14 +344,17 @@ static const char *am_first_idp(request_rec *r)
*/
static const char *am_get_idp(request_rec *r)
{
am_dir_cfg_rec *cfg = am_get_dir_cfg(r);
LassoServer *server;
const char *idp_provider_id;
const char *idp_metadata_file;
server = am_get_lasso_server(r);
if (server == NULL)
return NULL;
/*
* If we have a single IdP, return that one.
*/
if (apr_hash_count(cfg->idp_metadata_files) == 1)
if (g_hash_table_size(server->providers) == 1)
return am_first_idp(r);
/*
@ -367,10 +370,7 @@ static const char *am_get_idp(request_rec *r)
"Could not urldecode IdP discovery value.");
idp_provider_id = NULL;
} else {
idp_metadata_file = apr_hash_get(cfg->idp_metadata_files,
idp_provider_id,
APR_HASH_KEY_STRING);
if (idp_metadata_file == NULL)
if (g_hash_table_lookup(server->providers, idp_provider_id) == NULL)
idp_provider_id = NULL;
}
@ -2641,7 +2641,6 @@ static int am_handle_probe_discovery(request_rec *r) {
if (value == NULL) {
/* idp not in list, try the next one */
idp = NULL;
continue;
} else {
/* idp in list, use the value as the ping url */