diff options
| author | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2008-11-10 18:31:06 +0000 |
|---|---|---|
| committer | olavmrk <olavmrk@a716ebb1-153a-0410-b759-cfb97c6a1b53> | 2008-11-10 18:31:06 +0000 |
| commit | c1badad9447f192da7d2c0f1c97574a448767455 (patch) | |
| tree | cf0910f1b4459cd46ff287b0aa51988081cb10b5 /auth_mellon_config.c | |
| parent | cec59fc8bbef2b41977ea3dc13533d980e21f599 (diff) | |
| download | mod_auth_mellon-c1badad9447f192da7d2c0f1c97574a448767455.tar.gz mod_auth_mellon-c1badad9447f192da7d2c0f1c97574a448767455.tar.xz mod_auth_mellon-c1badad9447f192da7d2c0f1c97574a448767455.zip | |
Add two missing configuration merges from CA cert and SP cert support.
git-svn-id: https://modmellon.googlecode.com/svn/trunk@33 a716ebb1-153a-0410-b759-cfb97c6a1b53
Diffstat (limited to 'auth_mellon_config.c')
| -rw-r--r-- | auth_mellon_config.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/auth_mellon_config.c b/auth_mellon_config.c index e3f46bb..6c27e26 100644 --- a/auth_mellon_config.c +++ b/auth_mellon_config.c @@ -535,6 +535,10 @@ void *auth_mellon_dir_merge(apr_pool_t *p, void *base, void *add) add_cfg->sp_cert_file : base_cfg->sp_cert_file); + new_cfg->sp_cert_file = (add_cfg->sp_cert_file ? + add_cfg->sp_cert_file : + base_cfg->sp_cert_file); + new_cfg->idp_metadata_file = (add_cfg->idp_metadata_file ? add_cfg->idp_metadata_file : base_cfg->idp_metadata_file); @@ -548,6 +552,9 @@ void *auth_mellon_dir_merge(apr_pool_t *p, void *base, void *add) base_cfg->idp_ca_file); + new_cfg->idp_ca_file = (add_cfg->idp_ca_file ? + add_cfg->idp_ca_file : + base_cfg->idp_ca_file); apr_thread_mutex_create(&new_cfg->server_mutex, APR_THREAD_MUTEX_DEFAULT, p); |