diff options
author | benjamin.dauvergne <benjamin.dauvergne@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2012-06-28 10:44:03 +0000 |
---|---|---|
committer | benjamin.dauvergne <benjamin.dauvergne@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2012-06-28 10:44:03 +0000 |
commit | e5b6d0b87fe61baa6aa021ba7081b05a80ed3773 (patch) | |
tree | 2838c0aa96cb70f2e3852d92a205a98112e1b803 /auth_mellon_config.c | |
parent | 4925e34369d8915266aea490c689f9246cc3f408 (diff) | |
download | mod_auth_mellon-e5b6d0b87fe61baa6aa021ba7081b05a80ed3773.tar.gz mod_auth_mellon-e5b6d0b87fe61baa6aa021ba7081b05a80ed3773.tar.xz mod_auth_mellon-e5b6d0b87fe61baa6aa021ba7081b05a80ed3773.zip |
Fix commit 140: error in the merge statement for authn_context_class_ref configuration variable
git-svn-id: https://modmellon.googlecode.com/svn/trunk@158 a716ebb1-153a-0410-b759-cfb97c6a1b53
Diffstat (limited to 'auth_mellon_config.c')
-rw-r--r-- | auth_mellon_config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/auth_mellon_config.c b/auth_mellon_config.c index 7607668..89f33ac 100644 --- a/auth_mellon_config.c +++ b/auth_mellon_config.c @@ -1395,7 +1395,7 @@ void *auth_mellon_dir_merge(apr_pool_t *p, void *base, void *add) new_cfg->server = NULL; - new_cfg->authn_context_class_ref = (add_cfg->idp_metadata->nelts ? + new_cfg->authn_context_class_ref = (add_cfg->authn_context_class_ref->nelts ? add_cfg->authn_context_class_ref : base_cfg->authn_context_class_ref); |