From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Tue, 3 Aug 2010 19:34:50 +0000 (+0000)
Subject: NameIDFormat support.
X-Git-Tag: 2.4~52
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=454a08736ca5f6bdbdf78faf47b2050fb2b47a26

NameIDFormat support.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3287 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/configs/metagen.sh b/configs/metagen.sh
index 5178473..89568fa 100755
--- a/configs/metagen.sh
+++ b/configs/metagen.sh
@@ -21,11 +21,12 @@ SAML20PAOS="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
 SAML1POST="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
 SAML1ART="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
 
-while getopts a:c:e:h:n:o:s:t:u:12ADLN c
+while getopts a:c:e:f:h:n:o:s:t:u:12ADLN c
      do
          case $c in
            c)   CERTS[${#CERTS[*]}]=$OPTARG;;
            e)   ENTITYID=$OPTARG;;
+           f)   FORMATS=[${#FORMATS[*]}]=$OPTARG;;
            h)   HOSTS[${#HOSTS[*]}]=$OPTARG;;
            n)   NAKEDHOSTS[${#NAKEDHOSTS[*]}]=$OPTARG;;
            o)   ORGNAME=$OPTARG;;
@@ -45,7 +46,7 @@ while getopts a:c:e:h:n:o:s:t:u:12ADLN c
      done
 
 if [ ${#HOSTS[*]} -eq 0 -a ${#NAKEDHOSTS[*]} -eq 0 ] ; then
-    echo metagen -c cert1 [-c cert2 ...] -h host1 [-h host2 ...] [-e entityID]
+    echo metagen [-12ADLN] -c cert1 [-c cert2 ...] -h host1 [-h host2 ...] [-e entityID]
     exit 1
 fi
 
@@ -174,6 +175,13 @@ cat << EOF
 EOF
 done
 
+for f in ${FORMATS[@]}
+do
+cat << EOF
+    <md:NameIDFormat>$f</md:NameIDFormat>
+EOF
+done
+
 # Logout BEGIN
 if [ $LOGOUT -eq 1 ] ; then