[cpp-sp COMMIT] /branches/REL_2_4/isapi_shib/isapi_shib.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov  2 15:48:05 2011
New Revision: 3538

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3538&view=rev
Log:
Helps if you don't reverse a loop boolean.

Modified:
    branches/REL_2_4/isapi_shib/isapi_shib.cpp

Modified: branches/REL_2_4/isapi_shib/isapi_shib.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2_4/isapi_shib/isapi_shib.cpp?rev=3538&r1=3537&r2=3538&view=diff
==============================================================================
--- branches/REL_2_4/isapi_shib/isapi_shib.cpp (original)
+++ branches/REL_2_4/isapi_shib/isapi_shib.cpp Wed Nov  2 15:48:05 2011
@@ -560,7 +560,7 @@
     s.erase();
     size=s.size();
 
-    while (m_pfc->GetServerVariable(m_pfc,lpszVariable,s,&size)) {
+    while (!m_pfc->GetServerVariable(m_pfc,lpszVariable,s,&size)) {
         // Grumble. Check the error.
         DWORD e=GetLastError();
         if (e==ERROR_INSUFFICIENT_BUFFER)
@@ -613,7 +613,7 @@
     s.erase();
     size=s.size();
 
-    while (pfc->GetServerVariable(pfc,lpszVariable,s,&size)) {
+    while (!pfc->GetServerVariable(pfc,lpszVariable,s,&size)) {
         // Grumble. Check the error.
         DWORD e=GetLastError();
         if (e==ERROR_INSUFFICIENT_BUFFER)
@@ -644,7 +644,7 @@
         dynabuf buf(128);
         GetServerVariable(pfc,"INSTANCE_ID",buf,10);
         if (buf.empty())
-            return WriteClientError(pfc, "Shibboleth Extension failed to obtain INSTANCE_ID server variable.");
+            return WriteClientError(pfc, "Shibboleth Filter failed to obtain INSTANCE_ID server variable.");
 
         // Match site instance to host name, skip if no match.
         map<string,site_t>::const_iterator map_i=g_Sites.find(static_cast<char*>(buf));
@@ -657,13 +657,11 @@
 
         ShibTargetIsapiF stf(pfc, pn, map_i->second);
 
-        // "false" because we don't override the Shib settings
         pair<bool,long> res = stf.getServiceProvider().doAuthentication(stf);
         if (!g_spoofKey.empty())
             pn->SetHeader(pfc, "ShibSpoofCheck:", const_cast<char*>(g_spoofKey.c_str()));
         if (res.first) return res.second;
 
-        // "false" because we don't override the Shib settings
         res = stf.getServiceProvider().doExport(stf);
         if (res.first) return res.second;