Fix old attribute id.

[shibboleth/sp.git] / configs / attribute-map.xml.in

diff --git a/configs/attribute-map.xml.in b/configs/attribute-map.xml.in
index 5eb9abe..ecaac80 100644 (file)
--- a/configs/attribute-map.xml.in
+++ b/configs/attribute-map.xml.in
@@ -4,34 +4,44 @@
 
        <!-- First some useful eduPerson attributes that many sites might use. -->
        
-       <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="REMOTE_USER">
+       <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="eppn">
+               <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
+       </Attribute>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn">
                <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
        </Attribute>
        
        <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="affiliation">
                <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
        </Attribute>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" id="affiliation">
+               <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
+       </Attribute>
        
        <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="unscoped-affiliation">
-               <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
+               <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+       </Attribute>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="unscoped-affiliation">
+               <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
        </Attribute>
        
        <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="entitlement"/>
        
        <!-- A persistent id attribute that supports personalized anonymous access. -->
        
        <!-- First, the deprecated version: -->
-       <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="REMOTE_USER">
+       <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="persistent-id">
                <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
        </Attribute>
 
        <!-- Second, the new version (note the OID-style name): -->
-       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" id="REMOTE_USER">
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" id="persistent-id">
                <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$Name!!$NameQualifier!!$SPNameQualifier"/>
        </Attribute>
 
        <!-- Third, the SAML 2.0 NameID Format: -->
-       <Attribute name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" id="REMOTE_USER">
+       <Attribute name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" id="persistent-id">
                <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$Name!!$NameQualifier!!$SPNameQualifier"/>
        </Attribute>
        
@@ -44,6 +54,14 @@
        <Attribute name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" id="primary-orgunit-dn"/>
        <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" id="orgunit-dn"/>
        <Attribute name="urn:mace:dir:attribute-def:eduPersonOrgDN" id="org-dn"/>
+
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" id="primary-affiliation">
+               <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+       </Attribute>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" id="nickname"/>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" id="primary-orgunit-dn"/>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" id="orgunit-dn"/>
+       <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" id="org-dn"/>
        -->
 
        <!--Examples of LDAP-based attributes, uncomment to use these... -->
@@ -73,6 +91,32 @@
        <Attribute name="urn:mace:dir:attribute-def:ou" id="ou"/>
        <Attribute name="urn:mace:dir:attribute-def:businessCategory" id="businessCategory"/>
        <Attribute name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" id="physicalDeliveryOfficeName"/>
+
+       <Attribute name="urn:oid:2.5.4.3" id="cn"/>
+       <Attribute name="urn:oid:2.5.4.4" id="sn"/>
+       <Attribute name="urn:oid:2.5.4.42" id="givenName"/>
+       <Attribute name="urn:oid:0.9.2342.19200300.100.1.3" id="mail"/>
+       <Attribute name="urn:oid:2.5.4.20" id="telephoneNumber"/>
+       <Attribute name="urn:oid:2.5.4.12" id="title"/>
+       <Attribute name="urn:oid:2.5.4.43" id="initials"/>
+       <Attribute name="urn:oid:2.5.4.13" id="description"/>
+       <Attribute name="urn:oid:2.16.840.1.113730.3.1.1" id="carLicense"/>
+       <Attribute name="urn:oid:2.16.840.1.113730.3.1.2" id="departmentNumber"/>
+       <Attribute name="urn:oid:2.16.840.1.113730.3.1.241" id="displayName"/>
+       <Attribute name="urn:oid:1.2.840.113556.1.2.610" id="employeeNumber"/>
+       <Attribute name="urn:oid:1.2.840.113556.1.2.613" id="employeeType"/>
+       <Attribute name="urn:oid:2.16.840.1.113730.3.1.39" id="preferredLanguage"/>
+       <Attribute name="urn:oid:0.9.2342.19200300.100.1.10" id="manager"/>
+       <Attribute name="urn:oid:2.5.4.34" id="seeAlso"/>
+       <Attribute name="urn:oid:2.5.4.23" id="facsimileTelephoneNumber"/>
+       <Attribute name="urn:oid:2.5.4.9" id="street"/>
+       <Attribute name="urn:oid:2.5.4.18" id="postOfficeBox"/>
+       <Attribute name="urn:oid:2.5.4.17" id="postalCode"/>
+       <Attribute name="urn:oid:2.5.4.8" id="st"/>
+       <Attribute name="urn:oid:2.5.4.7" id="l"/>
+       <Attribute name="urn:oid:2.5.4.11" id="ou"/>
+       <Attribute name="urn:oid:2.5.4.15" id="businessCategory"/>
+       <Attribute name="urn:oid:2.5.4.19" id="physicalDeliveryOfficeName"/>
        -->
 
 </Attributes>