diff options
| author | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2011-05-18 10:49:14 +0000 |
|---|---|---|
| committer | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2011-05-18 10:49:14 +0000 |
| commit | 9c1fd66256147f4529ceb03f03148a003fa81b58 (patch) | |
| tree | 97ff74100b373c6ed77d31167c1491e2eba4f11c | |
| parent | 892592fe13ed55c6b8a89a6659b6ea0e4e066046 (diff) | |
| download | mod_auth_mellon-9c1fd66256147f4529ceb03f03148a003fa81b58.tar.gz mod_auth_mellon-9c1fd66256147f4529ceb03f03148a003fa81b58.tar.xz mod_auth_mellon-9c1fd66256147f4529ceb03f03148a003fa81b58.zip | |
Change am_server_add_providers to return number of providers from LassoServer object.
git-svn-id: https://modmellon.googlecode.com/svn/trunk@127 a716ebb1-153a-0410-b759-cfb97c6a1b53
| -rw-r--r-- | auth_mellon_handler.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/auth_mellon_handler.c b/auth_mellon_handler.c index c3284c3..b4401cf 100644 --- a/auth_mellon_handler.c +++ b/auth_mellon_handler.c @@ -211,13 +211,12 @@ static char *am_generate_metadata(apr_pool_t *p, request_rec *r) * Returns: * number of loaded providers */ -static int am_server_add_providers(request_rec *r) +static guint am_server_add_providers(request_rec *r) { am_dir_cfg_rec *cfg = am_get_dir_cfg(r); const char *idp_metadata_file; const char *idp_public_key_file; apr_size_t index; - int count = 0; if (cfg->idp_metadata_files->nelts == 1) idp_public_key_file = cfg->idp_public_key_file; @@ -237,12 +236,10 @@ static int am_server_add_providers(request_rec *r) ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Error adding IdP from \"%s\" to lasso server object.", idp_metadata_file); - } else { - count++; } } - return count; + return g_hash_table_size(cfg->server->providers); } static LassoServer *am_get_lasso_server(request_rec *r) |