Fix GSS wrapper element defs, add binary option.

diff --git a/schemas/shibboleth-2.0-attribute-map.xsd b/schemas/shibboleth-2.0-attribute-map.xsd
index 9f6652e..44a266a 100644 (file)
--- a/schemas/shibboleth-2.0-attribute-map.xsd
+++ b/schemas/shibboleth-2.0-attribute-map.xsd
@@ -38,11 +38,17 @@
         <anyAttribute namespace="##any" processContents="lax"/>
     </complexType>
     
-    <element name="GSSAPI" type="base64Binary">
+    <element name="GSSAPIContext" type="base64Binary">
         <annotation>
             <documentation>A wrapper element for GSS-API contexts.</documentation>
         </annotation>
     </element>
+
+    <element name="GSSAPIName" type="base64Binary">
+        <annotation>
+            <documentation>A wrapper element for GSS-API composite names.</documentation>
+        </annotation>
+    </element>
     
     <element name="Attributes">
         <annotation>
@@ -126,6 +132,11 @@
                 <documentation>If true, only an authenticated GSS-API naming attribute will be mapped.</documentation>
             </annotation>
         </attribute>
+        <attribute name="binary" type="boolean">
+            <annotation>
+                <documentation>If true, the GSS-API naming attribute will be base64-encoded for internal use.</documentation>
+            </annotation>
+        </attribute>
         <attribute name="scopeDelimiter" type="am:string">
             <annotation>
                 <documentation>