SPNameQualifier belongs to sp-hosted - not idp-remote.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@410 44740490-163a-0410-bde0-09ae8108e29a

docs/source/simplesamlphp-sp.xml

@@ -164,6 +164,18 @@
               as software-PKI.</para>
             </glossdef>
           </glossentry>
+
+          <glossentry>
+            <glossterm>SPNameQualifier</glossterm>
+
+            <glossdef>
+              <para>This corresponds to the SPNameQualifier in the SAML 2.0
+              specification. It allows to give subjects a SP specific
+              namespace. This value is seldom used, so if you don't need it,
+              do not include it. If you do not include it, simpleSAMLphp will
+              include the entityID of your SP as the SPNameQualifier.</para>
+            </glossdef>
+          </glossentry>
         </glosslist>
       </section>
 
@@ -332,18 +344,6 @@
                 </warning></para>
             </glossdef>
           </glossentry>
-
-          <glossentry>
-            <glossterm>SPNameQualifier</glossterm>
-
-            <glossdef>
-              <para>This corresponds to the SPNameQualifier in the SAML 2.0
-              specification. It allows to give subjects a SP specific
-              namespace. This value is seldom used, so if you don't need it,
-              do not include it. If you do not include it, simpleSAMLphp will
-              include the entityID of your SP as the SPNameQualifier.</para>
-            </glossdef>
-          </glossentry>
         </glosslist>
       </section>
 

www/admin/metadata.php

@@ -34,7 +34,7 @@ try {
 		foreach ($metalist AS $entityid => $mentry) {
 			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
 				array('entityid', 'host'),
-				array('request.signing','certificate','privatekey', 'NameIDFormat', 'ForceAuthn', 'AuthnContextClassRef')
+				array('request.signing','certificate','privatekey', 'NameIDFormat', 'ForceAuthn', 'AuthnContextClassRef', 'SPNameQualifier')
 			);
 		}
 		$et->data['metadata.saml20-sp-hosted'] = $results;
@@ -44,7 +44,7 @@ try {
 		foreach ($metalist AS $entityid => $mentry) {
 			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
 				array('entityid', 'SingleSignOnService', 'SingleLogoutService', 'certFingerprint'),
-				array('name', 'description', 'base64attributes', 'certificate', 'hint.cidr', 'saml2.relaxvalidation', 'SPNameQualifier', 'SingleLogoutServiceResponse')
+				array('name', 'description', 'base64attributes', 'certificate', 'hint.cidr', 'saml2.relaxvalidation', 'SingleLogoutServiceResponse')
 			);
 		}
 		$et->data['metadata.saml20-idp-remote'] = $results;