X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=fastcgi%2Fshibauthorizer.cpp;h=65fc832eb8fcd058656926d9e4493024691ba1e0;hb=87f8c5b1383ce267075073f2184f282450e16e09;hp=284793a11690d2dbddde74d649d457f4755b6a1f;hpb=3961f9ef8ed90edc3a52d459020dc8f115039b9f;p=shibboleth%2Fsp.git

diff --git a/fastcgi/shibauthorizer.cpp b/fastcgi/shibauthorizer.cpp
index 284793a..65fc832 100644
--- a/fastcgi/shibauthorizer.cpp
+++ b/fastcgi/shibauthorizer.cpp
@@ -67,7 +67,8 @@ class ShibTargetFCGIAuth : public AbstractSPRequest
 public:
     map<string,string> m_request_headers;
 
-    ShibTargetFCGIAuth(FCGX_Request* req, const char* scheme=NULL, const char* hostname=NULL, int port=0) : m_req(req) {
+    ShibTargetFCGIAuth(FCGX_Request* req, const char* scheme=NULL, const char* hostname=NULL, int port=0)
+            : AbstractSPRequest(SHIBSP_LOGCAT".FastCGI"), m_req(req) {
         const char* server_name_str = hostname;
         if (!server_name_str || !*server_name_str)
             server_name_str = FCGX_GetParam("SERVER_NAME", req->envp);
@@ -87,6 +88,8 @@ public:
         if (!server_scheme_str || !*server_scheme_str)
             server_scheme_str = (m_port == 443 || m_port == 8443) ? "https" : "http";
         m_scheme = server_scheme_str;
+
+        setRequestURI(FCGX_GetParam("REQUEST_URI", m_req->envp));
     }
 
     ~ShibTargetFCGIAuth() { }
@@ -100,9 +103,6 @@ public:
     int getPort() const {
         return m_port;
     }
-    const char* getRequestURI() const {
-        return FCGX_GetParam("REQUEST_URI", m_req->envp);
-    }
     const char* getMethod() const {
         return FCGX_GetParam("REQUEST_METHOD", m_req->envp);
     }
@@ -236,16 +236,6 @@ static void print_error(const char* msg)
 
 int main(void)
 {
-    const char* schemadir=getenv("SHIBSP_SCHEMAS");
-    if (!schemadir)
-        schemadir=SHIBSP_SCHEMAS;
-    const char* config=getenv("SHIBSP_CONFIG");
-    if (!config)
-        config=SHIBSP_CONFIG;
-
-    cerr << "SHIBSP_CONFIG = " << config << endl
-         << "SHIBSP_SCHEMAS = " << schemadir << endl;
-
     SPConfig* g_Config=&SPConfig::getConfig();
     g_Config->setFeatures(
         SPConfig::Listener |
@@ -255,11 +245,15 @@ int main(void)
         SPConfig::Logging |
         SPConfig::Handlers
         );
-    if (!g_Config->init(schemadir)) {
+    if (!g_Config->init()) {
         cerr << "failed to initialize Shibboleth libraries" << endl;
         exit(1);
     }
 
+    const char* config=getenv("SHIBSP_CONFIG");
+    if (!config)
+        config=SHIBSP_CONFIG;
+
     try {
         DOMDocument* dummydoc=XMLToolingConfig::getConfig().getParser().newDocument();
         XercesJanitor<DOMDocument> docjanitor(dummydoc);