Fix two fixes that caused SimpleSAMLphp in some cases to produce schema-invalid metadata

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

lib/SimpleSAML/Metadata/SAMLBuilder.php

@@ -287,7 +287,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
 		}
 
 
-		if ( array_key_exists('name', $metadata) || array_key_exists('attributes', $metadata)) {
+		if ( array_key_exists('name', $metadata) && array_key_exists('attributes', $metadata)) {
 			/**
 			 * Add an AttributeConsumingService element with information as name and description and list
 			 * of requested attributes

lib/SimpleSAML/Metadata/SAMLParser.php

@@ -481,6 +481,7 @@ class SimpleSAML_Metadata_SAMLParser {
 		if($acs === NULL) {
 			SimpleSAML_Logger::warning('Could not find a supported SAML 1.x AssertionConsumerService endpoint for ' .
 				var_export($ret['entityid'], TRUE) . '.');
+			return;
 		} else {
 			$ret['AssertionConsumerService'] = $acs['Location'];
 		}
@@ -506,7 +507,6 @@ class SimpleSAML_Metadata_SAMLParser {
 			break;
 		}
 
-
 		return $ret;
 	}
 
@@ -548,6 +548,7 @@ class SimpleSAML_Metadata_SAMLParser {
 		if($sso === NULL) {
 			SimpleSAML_Logger::warning('Could not find a supported SAML 1.x SingleSignOnService endpoint for ' .
 				var_export($ret['entityid'], TRUE) . '.');
+			return;
 		} else {
 			$ret['SingleSignOnService'] = $sso['Location'];
 		}
@@ -877,8 +878,7 @@ class SimpleSAML_Metadata_SAMLParser {
 		$attcs = SimpleSAML_Utilities::getDOMChildren($element, 'AttributeConsumingService', '@md');
 		if (count($attcs) > 0) {
 			self::parseAttributeConsumerService($attcs[0], $sp);
-		}
-		
+		}	
 
 		$this->spDescriptors[] = $sp;
 	}