From 883e3009485d1a5b60914bf2e7b9f1e783efb5cd Mon Sep 17 00:00:00 2001 From: Björn Mattsson Date: Tue, 14 Nov 2017 16:58:13 +0100 Subject: Moved research-and-scholarship and corrected checks for research-and-scholarship and code-of-conduct in Makefile" --- Makefile | 4 ++-- swamid-2.0/fs.liu.se-adfs-services-trust.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 895da9d4..7467d808 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ testMetadataUsage: testRefedsRnS: @echo "Checking for refeds R&S compatibillity for entities exported to eduGAIN" @for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \ - got_refeds_RnS=`cat $$x | sed 's;\(/dev/null | grep 'http://refeds.org/category/research-and-scholarship'` ; \ + got_refeds_RnS=`cat $$x | sed 's;\(/dev/null | grep 'http://refeds.org/category/research-and-scholarship'` ; \ if [ -n "$$got_refeds_RnS" ] ; then \ http_post=`cat $$x | sed 's;\(/dev/null | grep 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'` ; \ if [ -z "$$http_post" ] ; then echo " $$x: Missing HTTP-POST binding." | sed 's/.*/&/' ; fi ; \ @@ -128,7 +128,7 @@ testRefedsRnS: testGeantCoCo: @echo "Checking for Geant CoCo compliance for entities exported to eduGAIN" @for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \ - got_geant_CoCo=`cat $$x | sed 's;\(/dev/null | grep 'http://www.geant.net/uri/dataprotection-code-of-conduct/v1'` ; \ + got_geant_CoCo=`cat $$x | sed 's;\(/dev/null | grep 'http://www.geant.net/uri/dataprotection-code-of-conduct/v1'` ; \ if [ -n "$$got_geant_CoCo" ] ; then \ mdui_check=`cat $$x | sed 's;\(/dev/null` ; \ if [ -z "$$mdui_check" ] ; then \ diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml index 2753501f..904577cb 100644 --- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml +++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml @@ -6,9 +6,9 @@ http://www.swamid.se/policy/assurance/al1 http://www.swamid.se/policy/assurance/al2 https://refeds.org/sirtfi - http://refeds.org/category/research-and-scholarship + http://refeds.org/category/research-and-scholarship http://www.geant.net/uri/dataprotection-code-of-conduct/v1 -- cgit v1.2.3