Rename Shibboleth request handler type.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2270 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index 170ff7e..2fb7e15 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -151,20 +151,20 @@
                        <SessionInitiator type="Chaining" Location="/Login" isDefault="true" id="idp.example.org"
                                        relayState="cookie" entityID="https://idp.example.org/shibboleth">
                                <SessionInitiator type="SAML2" defaultACSIndex="1" template="@-PKGSYSCONFDIR-@/bindingTemplate.html"/>
-                               <SessionInitiator type="Shibboleth" defaultACSIndex="3"/>
+                               <SessionInitiator type="Shib1" defaultACSIndex="3"/>
                        </SessionInitiator>
                        
                        <!-- An example using an old-style WAYF, which means Shib 1 only unless an entityID is provided. -->
                        <SessionInitiator type="Chaining" Location="/WAYF" id="WAYF" relayState="cookie">
                                <SessionInitiator type="SAML2" defaultACSIndex="1" template="@-PKGSYSCONFDIR-@/bindingTemplate.html"/>
-                               <SessionInitiator type="Shibboleth" defaultACSIndex="3"/>
+                               <SessionInitiator type="Shib1" defaultACSIndex="3"/>
                                <SessionInitiator type="WAYF" defaultACSIndex="3" URL="https://wayf.example.org/WAYF"/>
                        </SessionInitiator>
 
                        <!-- An example supporting the new-style of discovery service. -->
                        <SessionInitiator type="Chaining" Location="/DS" id="DS" relayState="cookie">
                                <SessionInitiator type="SAML2" template="@-PKGSYSCONFDIR-@/bindingTemplate.html"/>
-                               <SessionInitiator type="Shibboleth" defaultACSIndex="3"/>
+                               <SessionInitiator type="Shib1" defaultACSIndex="3"/>
                                <SessionInitiator type="SAMLDS" URL="https://ds.example.org/DS"/>
                        </SessionInitiator>
                        

diff --git a/shibsp/handler/SessionInitiator.h b/shibsp/handler/SessionInitiator.h
index da9d196..518409e 100644 (file)
--- a/shibsp/handler/SessionInitiator.h
+++ b/shibsp/handler/SessionInitiator.h
@@ -70,7 +70,7 @@ namespace shibsp {
     #define SAMLDS_SESSION_INITIATOR "SAMLDS"
 
     /** SessionInitiator that supports Shibboleth V1 AuthnRequest redirects. */
-    #define SHIB1_SESSION_INITIATOR "Shibboleth"
+    #define SHIB1_SESSION_INITIATOR "Shib1"
 
     /** SessionInitiator that supports Shibboleth V1 WAYF redirects when no IdP is supplied. */
     #define WAYF_SESSION_INITIATOR "WAYF"