https://issues.shibboleth.net/jira/browse/CPPXT-66

[shibboleth/cpp-xmltooling.git] / xmltooling / util / ReloadableXMLFile.cpp

diff --git a/xmltooling/util/ReloadableXMLFile.cpp b/xmltooling/util/ReloadableXMLFile.cpp
index 6c2b68a..ae5f5be 100644 (file)
--- a/xmltooling/util/ReloadableXMLFile.cpp
+++ b/xmltooling/util/ReloadableXMLFile.cpp
@@ -103,7 +103,7 @@ static const XMLCh _CredentialResolver[] = UNICODE_LITERAL_18(C,r,e,d,e,n,t,i,a,
 
 ReloadableXMLFile::ReloadableXMLFile(const DOMElement* e, Category& log, bool startReloadThread)
     : m_root(e), m_local(true), m_validate(false), m_filestamp(0), m_reloadInterval(0),
-      m_lock(nullptr), m_loaded(false), m_log(log),
+      m_lock(nullptr), m_log(log), m_loaded(false),
 #ifndef XMLTOOLING_LITE
       m_credResolver(nullptr), m_trust(nullptr),
 #endif
@@ -202,7 +202,8 @@ ReloadableXMLFile::ReloadableXMLFile(const DOMElement* e, Category& log, bool st
                 XMLToolingConfig::getConfig().getPathResolver()->resolve(m_backing, PathResolver::XMLTOOLING_RUN_FILE);
                 log.debug("backup remote resource to (%s)", m_backing.c_str());
                 try {
-                    ifstream backer(m_backing + ".tag");
+                    string tagname = m_backing + ".tag";
+                    ifstream backer(tagname.c_str());
                     if (backer) {
                         char cachebuf[256];
                         if (backer.getline(cachebuf, 255)) {
@@ -396,7 +397,7 @@ pair<bool,DOMElement*> ReloadableXMLFile::load(bool backup)
         else {
             // Data comes from a file we have to parse.
             if (backup)
-                m_log.warn("using local backup of remote resource");
+                m_log.info("using local backup of remote resource");
             else
                 m_log.debug("loading configuration from external resource...");
 
@@ -480,7 +481,7 @@ pair<bool,DOMElement*> ReloadableXMLFile::load()
             m_log.debug("backing up remote resource to (%s)", m_backing.c_str());
             try {
                 Locker locker(getBackupLock());
-                ofstream backer(m_backing);
+                ofstream backer(m_backing.c_str());
                 backer << *(ret.second->getOwnerDocument());
                 preserveCacheTag();
             }
@@ -528,7 +529,8 @@ void ReloadableXMLFile::preserveCacheTag()
 {
     if (!m_cacheTag.empty() && !m_backing.empty()) {
         try {
-            ofstream backer(m_backing + ".tag");
+            string tagname = m_backing + ".tag";
+            ofstream backer(tagname.c_str());
             backer << m_cacheTag;
         }
         catch (exception&) {
@@ -558,8 +560,11 @@ void ReloadableXMLFile::validateSignature(Signature& sigObj) const
                         if (tlist->item(i)->getTransformType()==TRANSFORM_ENVELOPED_SIGNATURE)
                             valid=true;
                         else if (tlist->item(i)->getTransformType()!=TRANSFORM_EXC_C14N &&
-                                 tlist->item(i)->getTransformType()!=TRANSFORM_C14N &&
-                                 tlist->item(i)->getTransformType()!=TRANSFORM_C14N11) {
+                                 tlist->item(i)->getTransformType()!=TRANSFORM_C14N
+#ifdef XMLTOOLING_XMLSEC_C14N11
+                                 && tlist->item(i)->getTransformType()!=TRANSFORM_C14N11
+#endif
+                                 ) {
                             valid=false;
                             break;
                         }