Fix missing NameIDFormat in generated metadata.

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

www/saml2/idp/metadata.php

@@ -51,6 +51,13 @@ try {
 		unset($metaArray['SingleLogoutServiceResponse']);
 	}
 
+	if (array_key_exists('NameIDFormat', $idpmeta)) {
+		$metaArray['NameIDFormat'] = $idpmeta['NameIDFormat'];
+	} else {
+		$metaArray['NameIDFormat'] = 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient';
+	}
+
+
 	$metaflat = var_export($idpentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ',';
 
 	$metaArray['certData'] = $certInfo['certData'];

www/saml2/sp/metadata.php

@@ -31,6 +31,13 @@ try {
 		'SingleLogoutService' => $metadata->getGenerated('SingleLogoutService', 'saml20-sp-hosted'),
 	);
 
+	if (array_key_exists('NameIDFormat', $spmeta)) {
+		$metaArray['NameIDFormat'] = $spmeta['NameIDFormat'];
+	} else {
+		$metaArray['NameIDFormat'] = 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient';
+	}
+
+
 	$certInfo = SimpleSAML_Utilities::loadPublicKey($spmeta);
 	if ($certInfo !== NULL && array_key_exists('certData', $certInfo)) {
 		$metaArray['certData'] = $certInfo['certData'];

www/shib13/idp/metadata.php

@@ -39,6 +39,13 @@ try {
 		'certFingerprint' => $certFingerprint,
 	);
 
+	if (array_key_exists('NameIDFormat', $idpmeta)) {
+		$metaArray['NameIDFormat'] = $idpmeta['NameIDFormat'];
+	} else {
+		$metaArray['NameIDFormat'] = 'urn:mace:shibboleth:1.0:nameIdentifier';
+	}
+
+
 	$metaflat = var_export($idpentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ',';
 	
 	$metaArray['certData'] = $certInfo['certData'];

www/shib13/sp/metadata.php

@@ -36,6 +36,13 @@ try {
 		$metaArray['certData'] = $certInfo['certData'];
 	}
 
+	if (array_key_exists('NameIDFormat', $spmeta)) {
+		$metaArray['NameIDFormat'] = $spmeta['NameIDFormat'];
+	} else {
+		$metaArray['NameIDFormat'] = 'urn:mace:shibboleth:1.0:nameIdentifier';
+	}
+
+
 	$metaflat = var_export($spentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ',';
 
 	if (array_key_exists('certificate', $spmeta)) {