From 6faf9f9beaf11d09437dd5e88409d657ac58154d Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sat, 12 Jan 2008 17:10:02 +0000
Subject: [PATCH] Use UK federation metadata, not SDSS federation metadata.
 Allow domain-only locations (no trailing '/' on domain, and nothing else) to
 handle the Athens gateway entities' ACS locations.

---
 build/probe_nocerts.pl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/probe_nocerts.pl b/build/probe_nocerts.pl
index 66a9e423..63d60a9a 100755
--- a/build/probe_nocerts.pl
+++ b/build/probe_nocerts.pl
@@ -1,21 +1,22 @@
 #!/usr/bin/perl -w
 
-$known_bad{'census.data-archive.ac.uk:8080'} = 1;
+$known_bad{'census.data-archive.ac.uk:8080'} = 1; # it is really http, not https
 
-open(XML,"java -cp ../xalan-j_2_6_0/bin/xalan.jar org.apache.xalan.xslt.Process -IN ../xml/sdss-metadata-unsigned.xml -XSL extract_nocert_locs.xsl|") || die "could not open input file";
+open(XML,"java -cp ../xalan-j_2_6_0/bin/xalan.jar org.apache.xalan.xslt.Process -IN ../xml/ukfederation-metadata.xml -XSL extract_nocert_locs.xsl|") || die "could not open input file";
 while (<XML>) {
+	chop;
 	if (/^http:/) {
-		print "skipping http location: $_";
-	} elsif (/^https:\/\/([^\/:]+(:\d+)?)\//) {
+		print "skipping http location: $_\n";
+	} elsif (/^https:\/\/([^\/:]+(:\d+)?)(\/|$)/) {
 		my $location = $1;
 		$location .= ":443" unless defined $2;
 		if ($known_bad{$location}) {
-			print "skipping known bad location: $_";
+			print "skipping known bad location: $_\n";
 		} else {
 			$locations{$location} = 1;
 		}
 	} else {
-		print "bad location: $_";
+		print "bad location: $_\n";
 	}
 }
 close XML;