Change cacheTimeout configuration from minutes to seconds

to be consistent..

diff --git a/configs/shibboleth.ini b/configs/shibboleth.ini
index abe30f2..285e856 100644 (file)
--- a/configs/shibboleth.ini
+++ b/configs/shibboleth.ini
@@ -41,8 +41,8 @@ aap-uri=/opt/shibboleth/etc/shibboleth/AAP.xml
 cacheType=memory
 # how often to run the cache cleanup (in seconds)  (300 == 5*60 == 5 minutes)
 cacheClean=300
-# idle timeout (in minutes)  (240 == 8*60 == 8 hours)
-cacheTimeout=240
+# idle timeout (in seconds)  (14400 == 240*60 == 4*60*60 == 4 hours)
+cacheTimeout=14400
 
 [attributes]
 urn:mace:eduPerson:1.0:eduPersonPrincipalName=scoped

diff --git a/shib-target/shib-ccache.cpp b/shib-target/shib-ccache.cpp
index cca0ffc..12cb3dc 100644 (file)
--- a/shib-target/shib-ccache.cpp
+++ b/shib-target/shib-ccache.cpp
@@ -342,7 +342,7 @@ void InternalCCache::cleanup()
   if (ini.get_tag (SHIBTARGET_SHAR, SHIBTARGET_TAG_CACHECLEAN, true, &tag))
     rerun_timer = atoi(tag.c_str());
   if (ini.get_tag (SHIBTARGET_SHAR, SHIBTARGET_TAG_CACHETIMEOUT, true, &tag))
-    timeout_life = atoi(tag.c_str()) * 60;
+    timeout_life = atoi(tag.c_str());
 
   if (rerun_timer <= 0)
     rerun_timer = 300;         // rerun every 5 minutes