diff options
| author | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2010-06-17 07:17:34 +0000 |
|---|---|---|
| committer | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2010-06-17 07:17:34 +0000 |
| commit | 834bf607be23ce9351ef11174f43f399d03fd621 (patch) | |
| tree | 8557cec26a4b4892f17d6198ef7cfc5c335811cc /auth_mellon_handler.c | |
| parent | 525ba0c50bb49d299f033d6f25a3f72e249bf09b (diff) | |
| download | mod_auth_mellon-834bf607be23ce9351ef11174f43f399d03fd621.tar.gz mod_auth_mellon-834bf607be23ce9351ef11174f43f399d03fd621.tar.xz mod_auth_mellon-834bf607be23ce9351ef11174f43f399d03fd621.zip | |
Display proper error when missing MellonSPMetadataFile.
git-svn-id: https://modmellon.googlecode.com/svn/trunk@87 a716ebb1-153a-0410-b759-cfb97c6a1b53
Diffstat (limited to 'auth_mellon_handler.c')
| -rw-r--r-- | auth_mellon_handler.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/auth_mellon_handler.c b/auth_mellon_handler.c index 1fcdb5f..16c4def 100644 --- a/auth_mellon_handler.c +++ b/auth_mellon_handler.c @@ -412,16 +412,21 @@ static LassoServer *am_get_lasso_server(request_rec *r) apr_thread_mutex_lock(cfg->server_mutex); if(cfg->server == NULL) { -#ifdef HAVE_lasso_server_new_from_buffers - /* - * If we have no metadata, try to generate them now - */ if(cfg->sp_metadata_file == NULL) { - apr_pool_t *pool = r->server->process->pconf; +#ifdef HAVE_lasso_server_new_from_buffers + /* + * Try to generate missing metadata + */ + apr_pool_t *pool = r->server->process->pconf; cfg->sp_metadata_file = am_generate_metadata(pool, r); - } +#else + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "Missing MellonSPMetadataFile option."); + apr_thread_mutex_unlock(cfg->server_mutex); + return NULL; #endif /* HAVE_lasso_server_new_from_buffers */ + } cfg->server = SERVER_NEW(cfg->sp_metadata_file, cfg->sp_private_key_file, |