[cpp-sp] 01/02: Revive FastCGI build

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=235321625507b83c349808d7c0feeb7b0060f6d0

commit 235321625507b83c349808d7c0feeb7b0060f6d0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 30 11:33:49 2025 -0400

    Revive FastCGI build
---
 .gitignore                 |  2 ++
 fastcgi/Makefile.am        | 20 ++++++--------------
 fastcgi/shibauthorizer.cpp |  6 +++---
 fastcgi/shibresponder.cpp  |  8 ++++----
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index b359f7bd..911274b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,8 @@ x64
 /build-aux
 /build
 /Build
+/fastcgi/shibauthorizer
+/fastcgi/shibresponder
 /Projects/VC??/apache/mod_shib_24-Debug/
 /Projects/VC??/apache/mod_shib_24-Release/
 /Projects/VC??/fastcgi/shibauthorizer-Debug/
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index d5c77490..5b5c9f16 100644
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -10,29 +10,21 @@ shibauthorizer_SOURCES = shibauthorizer.cpp
 shibauthorizer_CXXFLAGS = $(FASTCGI_INCLUDE) \
   $(AM_CXXFLAGS) \
   $(BOOST_CPPFLAGS) \
-  $(PTHREAD_CFLAGS) \
-  $(xerces_CFLAGS) \
-  $(xmltooling_lite_CFLAGS)
+  $(PTHREAD_CFLAGS)
 shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS)
 shibauthorizer_LDADD = $(FASTCGI_LIBS) \
-  $(top_builddir)/shibsp/libshibsp-lite.la \
-  $(PTHREAD_LIBS) \
-  $(xerces_LIBS) \
-  $(xmltooling_lite_LIBS)
+  $(top_builddir)/shibsp/libshibsp.la \
+  $(PTHREAD_LIBS)
 
 shibresponder_SOURCES = shibresponder.cpp
 shibresponder_CXXFLAGS = $(FASTCGI_INCLUDE) \
   $(AM_CXXFLAGS) \
   $(BOOST_CPPFLAGS) \
-  $(PTHREAD_CFLAGS) \
-  $(xerces_CFLAGS) \
-  $(xmltooling_lite_CFLAGS)
+  $(PTHREAD_CFLAGS)
 shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS)
 shibresponder_LDADD = $(FASTCGI_LIBS) \
-  $(top_builddir)/shibsp/libshibsp-lite.la \
-  $(PTHREAD_LIBS) \
-  $(xerces_LIBS) \
-  $(xmltooling_lite_LIBS)
+  $(top_builddir)/shibsp/libshibsp.la \
+  $(PTHREAD_LIBS)
 
 endif
 
diff --git a/fastcgi/shibauthorizer.cpp b/fastcgi/shibauthorizer.cpp
index b9a04ca4..78bc3ccf 100644
--- a/fastcgi/shibauthorizer.cpp
+++ b/fastcgi/shibauthorizer.cpp
@@ -307,7 +307,7 @@ int main(void)
 
             pair<bool,long> res = sta.getAgent().doAuthentication(sta);
             if (res.first) {
-                sta.debug(Priority::SHIB_DEBUG, "shib: doAuthentication handled the request");
+                sta.debug("shib: doAuthentication handled the request");
                 switch(res.second) {
                     case SHIB_RETURN_OK:
                         print_ok(sta.m_request_headers);
@@ -329,7 +329,7 @@ int main(void)
 
             res = sta.getAgent().doExport(sta);
             if (res.first) {
-                sta.log(Priority::SHIB_DEBUG, "shib: doExport handled request");
+                sta.debug("shib: doExport handled request");
                 switch(res.second) {
                     case SHIB_RETURN_OK:
                         print_ok(sta.m_request_headers);
@@ -351,7 +351,7 @@ int main(void)
 
             res = sta.getAgent().doAuthorization(sta);
             if (res.first) {
-                sta.log(Priority::SHIB_DEBUG, "shib: doAuthorization handled request");
+                sta.debug("shib: doAuthorization handled request");
                 switch(res.second) {
                     case SHIB_RETURN_OK:
                         print_ok(sta.m_request_headers);
diff --git a/fastcgi/shibresponder.cpp b/fastcgi/shibresponder.cpp
index cefb9666..14096060 100644
--- a/fastcgi/shibresponder.cpp
+++ b/fastcgi/shibresponder.cpp
@@ -123,9 +123,9 @@ public:
         const char* s = FCGX_GetParam("REMOTE_ADDR", m_req->envp);
         return s ? s : "";
     }
-    void log(SPLogLevel level, const string& msg) const {
+    void log(Priority::PriorityLevel level, const string& msg) const {
         AbstractSPRequest::log(level,msg);
-        if (level >= SPError)
+        if (level <= Priority::SHIB_ERROR)
             cerr << "shib: " << msg;
     }
 
@@ -318,14 +318,14 @@ int main(void)
         // the connection deadlocks until a timeout expires!).
         char* content = nullptr;
         gstdin(&request, &content);
-        auto_arrayptr<char> wrapper(content);
+        unique_ptr<char[]> wrapper(content);
 
         try {
             ShibTargetFCGI stf(&request, content, g_ServerScheme.c_str(), g_ServerName.c_str(), g_ServerPort);
 
             pair<bool,long> res = stf.getAgent().doHandler(stf);
             if (res.first) {
-                stf.log(Priority::SHIB_DEBUG, "shib: doHandler handled the request");
+                stf.debug("shib: doHandler handled the request");
                 switch(res.second) {
                     case SHIB_RETURN_OK:
                         print_ok();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.