From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Wed, 23 Jan 2008 03:03:45 +0000 (+0000)
Subject: Moved logout templates to Errors tag.
X-Git-Tag: 2.4~586
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=5265b0a200b226908b9a0876c211c54612e23488

Moved logout templates to Errors tag.

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

diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index 90ab0ee..54d9b3a 100644
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -487,8 +487,6 @@
 		<attribute name="unsetHeaders" type="conf:listOfStrings"/>
 		<attribute name="metadataAttributePrefix" type="conf:string"/>
 	    <attribute name="attributePrefix" type="conf:string"/>
-		<attribute name="localLogout" type="anyURI"/>
-		<attribute name="globalLogout" type="anyURI"/>
 	</attributeGroup>
 
     <attributeGroup name="RelyingPartyGroup">
@@ -626,6 +624,8 @@
 			<attribute name="metadata" type="anyURI"/>
 			<attribute name="access" type="anyURI"/>
 			<attribute name="ssl" type="anyURI"/>
+            <attribute name="localLogout" type="anyURI"/>
+            <attribute name="globalLogout" type="anyURI"/>
 			<attribute name="supportContact" type="conf:string"/>
 			<attribute name="logoLocation" type="anyURI"/>
 			<attribute name="styleSheet" type="anyURI"/>
diff --git a/shibsp/handler/impl/LogoutHandler.cpp b/shibsp/handler/impl/LogoutHandler.cpp
index 5342397..8bd3d56 100644
--- a/shibsp/handler/impl/LogoutHandler.cpp
+++ b/shibsp/handler/impl/LogoutHandler.cpp
@@ -40,7 +40,8 @@ pair<bool,long> LogoutHandler::sendLogoutPage(
     const Application& application, const HTTPRequest& request, HTTPResponse& response, bool local, const char* status
     ) const
 {
-    pair<bool,const char*> prop = application.getString(local ? "localLogout" : "globalLogout");
+    const PropertySet* props = application.getPropertySet("Errors");
+    pair<bool,const char*> prop = props ? props->getString(local ? "localLogout" : "globalLogout") : pair<bool,const char*>(false,NULL);
     if (prop.first) {
         response.setContentType("text/html");
         response.setResponseHeader("Expires","01-Jan-1997 12:00:00 GMT");
@@ -50,7 +51,7 @@ pair<bool,long> LogoutHandler::sendLogoutPage(
             throw ConfigurationException("Unable to access $1 HTML template.", params(1,local ? "localLogout" : "globalLogout"));
         TemplateParameters tp;
         tp.m_request = &request;
-        tp.setPropertySet(application.getPropertySet("Errors"));
+        tp.setPropertySet(props);
         if (status)
             tp.m_map["logoutStatus"] = status;
         stringstream str;