Linux porting changes

[shibboleth/cpp-sp.git] / shibd / shibd.cpp

diff --git a/shibd/shibd.cpp b/shibd/shibd.cpp
index 3d0632a..973645a 100644 (file)
--- a/shibd/shibd.cpp
+++ b/shibd/shibd.cpp
@@ -49,6 +49,7 @@
 #include <shibsp/remoting/ListenerService.h>\r
 #include <xercesc/util/XMLUniDefs.hpp>\r
 #include <xmltooling/XMLToolingConfig.h>\r
+#include <xmltooling/util/XMLConstants.h>\r
 #include <xmltooling/util/XMLHelper.h>\r
 \r
 using namespace shibsp;\r
@@ -119,9 +120,9 @@ int real_main(int preinit)
             (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapping) : SPConfig::Logging)\r
             );\r
         if (!shar_config)\r
-            shar_config=getenv("SHIBCONFIG");\r
+            shar_config=getenv("SHIBSP_CONFIG");\r
         if (!shar_schemadir)\r
-            shar_schemadir=getenv("SHIBSCHEMAS");\r
+            shar_schemadir=getenv("SHIBSP_SCHEMAS");\r
         if (!shar_schemadir)\r
             shar_schemadir=SHIBSP_SCHEMAS;\r
         if (!shar_config)\r
@@ -135,9 +136,9 @@ int real_main(int preinit)
             fprintf(stderr, "loading configuration file: %s\n", shar_config);\r
             static const XMLCh path[] = UNICODE_LITERAL_4(p,a,t,h);\r
             static const XMLCh validate[] = UNICODE_LITERAL_8(v,a,l,i,d,a,t,e);\r
-            DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument();\r
-            XercesJanitor<DOMDocument> docjanitor(dummydoc);\r
-            DOMElement* dummy = dummydoc->createElementNS(NULL,path);\r
+            xercesc::DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument();\r
+            XercesJanitor<xercesc::DOMDocument> docjanitor(dummydoc);\r
+            xercesc::DOMElement* dummy = dummydoc->createElementNS(NULL,path);\r
             auto_ptr_XMLCh src(shar_config);\r
             dummy->setAttributeNS(NULL,path,src.get());\r
             dummy->setAttributeNS(NULL,validate,xmlconstants::XML_ONE);\r
@@ -262,9 +263,9 @@ int main(int argc, char *argv[])
         usage(argv[0]);\r
 \r
     if (!shar_config)\r
-        shar_config=getenv("SHIBCONFIG");\r
+        shar_config=getenv("SHIBSP_CONFIG");\r
     if (!shar_schemadir)\r
-        shar_schemadir=getenv("SHIBSCHEMAS");\r
+        shar_schemadir=getenv("SHIBSP_SCHEMAS");\r
     if (!shar_schemadir)\r
         shar_schemadir=SHIBSP_SCHEMAS;\r
     if (!shar_config)\r
@@ -291,9 +292,9 @@ int main(int argc, char *argv[])
         fprintf(stderr, "loading configuration file: %s\n", shar_config);\r
         static const XMLCh path[] = UNICODE_LITERAL_4(p,a,t,h);\r
         static const XMLCh validate[] = UNICODE_LITERAL_8(v,a,l,i,d,a,t,e);\r
-        DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument();\r
-        XercesJanitor<DOMDocument> docjanitor(dummydoc);\r
-        DOMElement* dummy = dummydoc->createElementNS(NULL,path);\r
+        xercesc::DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument();\r
+        XercesJanitor<xercesc::DOMDocument> docjanitor(dummydoc);\r
+        xercesc::DOMElement* dummy = dummydoc->createElementNS(NULL,path);\r
         auto_ptr_XMLCh src(shar_config);\r
         dummy->setAttributeNS(NULL,path,src.get());\r
         dummy->setAttributeNS(NULL,validate,xmlconstants::XML_ONE);\r