[cpp-sp COMMIT] /branches/REL_2/apache/mod_shib.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun 17 15:40:37 2013
New Revision: 3867

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3867&view=rev
Log:
Restrict pre-2.4 use of new require rules

Modified:
    branches/REL_2/apache/mod_shib.cpp

Modified: branches/REL_2/apache/mod_shib.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/apache/mod_shib.cpp?rev=3867&r1=3866&r2=3867&view=diff
==============================================================================
--- branches/REL_2/apache/mod_shib.cpp (original)
+++ branches/REL_2/apache/mod_shib.cpp Mon Jun 17 15:40:37 2013
@@ -1291,11 +1291,18 @@
                 status = true;
             }
         }
-        else if ((!strcmp(w,"valid-user") || !strcmp(w,"shib-session")) && session) {
-            request.log(SPRequest::SPDebug, "htaccess: accepting shib-session/valid-user based on active session");
+        else if (!strcmp(w,"valid-user") && session) {
+            request.log(SPRequest::SPDebug, "htaccess: accepting valid-user based on active session");
             status = true;
         }
+        else if (sta->m_dc->bCompatWith24 == 1 && !strcmp(w,"shib-session") && session) {
+            request.log(SPRequest::SPDebug, "htaccess: accepting shib-session based on active session");
+            status = true;
+        }
         else if (!strcmp(w,"user") && !remote_user.empty()) {
+            status = (doUser(*sta, t) == shib_acl_true);
+        }
+        else if (sta->m_dc->bCompatWith24 == 1 && !strcmp(w,"shib-user") && !remote_user.empty()) {
             status = (doUser(*sta, t) == shib_acl_true);
         }
         else if (!strcmp(w,"group")  && !remote_user.empty()) {