projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
00f9e84
)
Cache directory was not initialized properly.
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 2 May 2012 01:25:49 +0000
(
01:25
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 2 May 2012 01:25:49 +0000
(
01:25
+0000)
shibsp/SPConfig.cpp
patch
|
blob
|
history
diff --git
a/shibsp/SPConfig.cpp
b/shibsp/SPConfig.cpp
index
6206236
..
c79a404
100644
(file)
--- a/
shibsp/SPConfig.cpp
+++ b/
shibsp/SPConfig.cpp
@@
-190,7
+190,7
@@
bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
PathResolver localpr;
localpr.setDefaultPrefix(inst_prefix2.c_str());
inst_prefix = getenv("SHIBSP_CFGDIR");
PathResolver localpr;
localpr.setDefaultPrefix(inst_prefix2.c_str());
inst_prefix = getenv("SHIBSP_CFGDIR");
- if (!inst_prefix)
+ if (!inst_prefix
|| !*inst_prefix
)
inst_prefix = SHIBSP_CFGDIR;
localpr.setCfgDir(inst_prefix);
XMLToolingConfig::getConfig().log_config(localpr.resolve(ll, PathResolver::XMLTOOLING_CFG_FILE, PACKAGE_NAME).c_str());
inst_prefix = SHIBSP_CFGDIR;
localpr.setCfgDir(inst_prefix);
XMLToolingConfig::getConfig().log_config(localpr.resolve(ll, PathResolver::XMLTOOLING_CFG_FILE, PACKAGE_NAME).c_str());
@@
-240,19
+240,23
@@
bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
pr->setDefaultPrefix(inst_prefix2.c_str());
pr->setCfgDir(inst_prefix);
inst_prefix = getenv("SHIBSP_LIBDIR");
pr->setDefaultPrefix(inst_prefix2.c_str());
pr->setCfgDir(inst_prefix);
inst_prefix = getenv("SHIBSP_LIBDIR");
- if (!inst_prefix)
+ if (!inst_prefix
|| !*inst_prefix
)
inst_prefix = SHIBSP_LIBDIR;
pr->setLibDir(inst_prefix);
inst_prefix = getenv("SHIBSP_LOGDIR");
inst_prefix = SHIBSP_LIBDIR;
pr->setLibDir(inst_prefix);
inst_prefix = getenv("SHIBSP_LOGDIR");
- if (!inst_prefix)
+ if (!inst_prefix
|| !*inst_prefix
)
inst_prefix = SHIBSP_LOGDIR;
pr->setLogDir(inst_prefix);
inst_prefix = getenv("SHIBSP_RUNDIR");
inst_prefix = SHIBSP_LOGDIR;
pr->setLogDir(inst_prefix);
inst_prefix = getenv("SHIBSP_RUNDIR");
- if (!inst_prefix)
+ if (!inst_prefix
|| !*inst_prefix
)
inst_prefix = SHIBSP_RUNDIR;
pr->setRunDir(inst_prefix);
inst_prefix = SHIBSP_RUNDIR;
pr->setRunDir(inst_prefix);
+ inst_prefix = getenv("SHIBSP_CACHEDIR");
+ if (!inst_prefix || !*inst_prefix)
+ inst_prefix = SHIBSP_CACHEDIR;
+ pr->setCacheDir(inst_prefix);
inst_prefix = getenv("SHIBSP_XMLDIR");
inst_prefix = getenv("SHIBSP_XMLDIR");
- if (!inst_prefix)
+ if (!inst_prefix
|| !*inst_prefix
)
inst_prefix = SHIBSP_XMLDIR;
pr->setXMLDir(inst_prefix);
inst_prefix = SHIBSP_XMLDIR;
pr->setXMLDir(inst_prefix);