diff --git a/attributemap/deprecatedSchacNS.php b/attributemap/deprecatedSchacNS.php
new file mode 100644
index 0000000000000000000000000000000000000000..c6ed105b8b3e0b6e0fabc640dd6cd109ad36cccf
--- /dev/null
+++ b/attributemap/deprecatedSchacNS.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * This file provides translations from the schac namespace to the old, deprecated namespace provided by TERENA.
+ */
+
+define('SCHAC_OLD_NS', 'urn:mace:terena.org:attribute-def:');
+define('SCHAC_NEW_NS', SCHAC_NEW_NS.'');
+
+$attributemap = array(
+ SCHAC_NEW_NS.'schacCountryOfCitizenship' => SCHAC_OLD_NS.'schacCountryOfCitizenship',
+ SCHAC_NEW_NS.'schacCountryOfResidence' => SCHAC_OLD_NS.'schacCountryOfResidence',
+ SCHAC_NEW_NS.'schacDateOfBirth' => SCHAC_OLD_NS.'schacDateOfBirth',
+ SCHAC_NEW_NS.'schacExpiryDate' => SCHAC_OLD_NS.'schacExpiryDate',
+ SCHAC_NEW_NS.'schacGender' => SCHAC_OLD_NS.'schacGender',
+ SCHAC_NEW_NS.'schacHomeOrganization' => SCHAC_OLD_NS.'schacHomeOrganization',
+ SCHAC_NEW_NS.'schacHomeOrganizationType' => SCHAC_OLD_NS.'schacHomeOrganizationType',
+ SCHAC_NEW_NS.'schacMotherTongue' => SCHAC_OLD_NS.'schacMotherTongue',
+ SCHAC_NEW_NS.'schacPersonalPosition' => SCHAC_OLD_NS.'schacPersonalPosition',
+ SCHAC_NEW_NS.'schacPersonalTitle' => SCHAC_OLD_NS.'schacPersonalTitle',
+ SCHAC_NEW_NS.'schacPersonalUniqueCode' => SCHAC_OLD_NS.'schacPersonalUniqueCode',
+ SCHAC_NEW_NS.'schacPersonalUniqueID' => SCHAC_OLD_NS.'schacPersonalUniqueID',
+ SCHAC_NEW_NS.'schacPlaceOfBirth' => SCHAC_OLD_NS.'schacPlaceOfBirth',
+ SCHAC_NEW_NS.'schacProjectMembership' => SCHAC_OLD_NS.'schacProjectMembership',
+ SCHAC_NEW_NS.'schacProjectSpecificRole' => SCHAC_OLD_NS.'schacProjectSpecificRole',
+ SCHAC_NEW_NS.'schacSn1' => SCHAC_OLD_NS.'schacSn1',
+ SCHAC_NEW_NS.'schacSn2' => SCHAC_OLD_NS.'schacSn2',
+ SCHAC_NEW_NS.'schacUserPresenceID' => SCHAC_OLD_NS.'schacUserPresenceID',
+ SCHAC_NEW_NS.'schacUserPrivateAttribute' => SCHAC_OLD_NS.'schacUserPrivateAttribute',
+ SCHAC_NEW_NS.'schacUserStatus' => SCHAC_OLD_NS.'schacUserStatus',
+);
diff --git a/attributemap/name2oid.php b/attributemap/name2oid.php
index 9d78f32c15d47ba113087e9b1db82f7b8267e73e..90f689a0ecd607dd33da98b91ca79149ad459151 100644
--- a/attributemap/name2oid.php
+++ b/attributemap/name2oid.php
@@ -130,7 +130,27 @@ $attributemap = array(
'roleOccupant' => 'urn:oid:2.5.4.33',
'roomNumber' => 'urn:oid:0.9.2342.19200300.100.1.6',
'sOARecord' => 'urn:oid:0.9.2342.19200300.100.1.30',
+ 'schacCountryOfCitizenship' => 'urn:oid:1.3.6.1.4.1.25178.1.2.5',
+ 'schacCountryOfResidence' => 'urn:oid:1.3.6.1.4.1.25178.1.2.11',
+ 'schacDateOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.3',
+ 'schacExpiryDate' => 'urn:oid:1.3.6.1.4.1.25178.1.2.17',
'schacGender' => 'urn:oid:1.3.6.1.4.1.25178.1.2.2',
+ 'schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
+ 'schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
+ 'schacMotherTongue' => 'urn:oid:1.3.6.1.4.1.25178.1.2.1',
+ 'schacPersonalPosition' => 'urn:oid:1.3.6.1.4.1.25178.1.2.13',
+ 'schacPersonalTitle' => 'urn:oid:1.3.6.1.4.1.25178.1.2.8',
+ 'schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
+ 'schacPersonalUniqueID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.15',
+ 'schacPlaceOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.4',
+ 'schacProjectMembership' => 'urn:oid:1.3.6.1.4.1.25178.1.2.20',
+ 'schacProjectSpecificRole' => 'urn:oid:1.3.6.1.4.1.25178.1.2.21',
+ 'schacSn1' => 'urn:oid:1.3.6.1.4.1.25178.1.2.6',
+ 'schacSn2' => 'urn:oid:1.3.6.1.4.1.25178.1.2.7',
+ 'schacUserPresenceID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.12',
+ 'schacUserPrivateAttribute' => 'urn:oid:1.3.6.1.4.1.25178.1.2.18',
+ 'schacUserStatus' => 'urn:oid:1.3.6.1.4.1.25178.1.2.19',
+ 'schacYearOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.0.2.3',
'searchGuide' => 'urn:oid:2.5.4.14',
'secretary' => 'urn:oid:0.9.2342.19200300.100.1.21',
'seeAlso' => 'urn:oid:2.5.4.34',
@@ -164,7 +184,4 @@ $attributemap = array(
'userid' => 'urn:oid:0.9.2342.19200300.100.1.1',
'x121Address' => 'urn:oid:2.5.4.24',
'x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
- 'schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
- 'schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
- 'schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
);
diff --git a/attributemap/name2urn.php b/attributemap/name2urn.php
index 1861328145bbf2f1e4643b6d8d5b028c2147ca25..799a338c08bf05a4c702bb7896a2ad95d18b170f 100644
--- a/attributemap/name2urn.php
+++ b/attributemap/name2urn.php
@@ -129,9 +129,27 @@ $attributemap = array(
'roleOccupant' => 'urn:mace:dir:attribute-def:roleOccupant',
'roomNumber' => 'urn:mace:dir:attribute-def:roomNumber',
'sOARecord' => 'urn:mace:dir:attribute-def:sOARecord',
- 'schacGender' => 'urn:mace:dir:attribute-def:schacGender',
+ 'schacCountryOfCitizenship' => 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship',
+ 'schacCountryOfResidence' => 'urn:mace:terena.org:attribute-def:schacCountryOfResidence',
+ 'schacDateOfBirth' => 'urn:mace:terena.org:attribute-def:schacDateOfBirth',
+ 'schacExpiryDate' => 'urn:mace:terena.org:attribute-def:schacExpiryDate',
+ 'schacGender' => 'urn:mace:terena.org:attribute-def:schacGender',
'schacHomeOrganization' => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
'schacHomeOrganizationType' => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
+ 'schacMotherTongue' => 'urn:mace:terena.org:attribute-def:schacMotherTongue',
+ 'schacPersonalPosition' => 'urn:mace:terena.org:attribute-def:schacPersonalPosition',
+ 'schacPersonalTitle' => 'urn:mace:terena.org:attribute-def:schacPersonalTitle',
+ 'schacPersonalUniqueCode' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode',
+ 'schacPersonalUniqueID' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID',
+ 'schacPlaceOfBirth' => 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth',
+ 'schacProjectMembership' => 'urn:mace:terena.org:attribute-def:schacProjectMembership',
+ 'schacProjectSpecificRole' => 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole',
+ 'schacSn1' => 'urn:mace:terena.org:attribute-def:schacSn1',
+ 'schacSn2' => 'urn:mace:terena.org:attribute-def:schacSn2',
+ 'schacUserPresenceID' => 'urn:mace:terena.org:attribute-def:schacUserPresenceID',
+ 'schacUserPrivateAttribute' => 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute',
+ 'schacUserStatus' => 'urn:mace:terena.org:attribute-def:schacUserStatus',
+ 'schacYearOfBirth' => 'urn:mace:terena.org:attribute-def:schacYearOfBirth',
'searchGuide' => 'urn:mace:dir:attribute-def:searchGuide',
'secretary' => 'urn:mace:dir:attribute-def:secretary',
'seeAlso' => 'urn:mace:dir:attribute-def:seeAlso',
diff --git a/attributemap/newSchacNS.php b/attributemap/newSchacNS.php
new file mode 100644
index 0000000000000000000000000000000000000000..798af034116bbd88b417d9022243ad818d135933
--- /dev/null
+++ b/attributemap/newSchacNS.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * This file provides translations from the deprecated schac namespace provided by TERENA, to the new namespace.
+ */
+
+define('SCHAC_OLD_NS', 'urn:mace:terena.org:attribute-def:');
+define('SCHAC_NEW_NS', SCHAC_NEW_NS.'');
+
+$attributemap = array(
+ SCHAC_OLD_NS.'schacCountryOfCitizenship' => SCHAC_NEW_NS.'schacCountryOfCitizenship',
+ SCHAC_OLD_NS.'schacCountryOfResidence' => SCHAC_NEW_NS.'schacCountryOfResidence',
+ SCHAC_OLD_NS.'schacDateOfBirth' => SCHAC_NEW_NS.'schacDateOfBirth',
+ SCHAC_OLD_NS.'schacExpiryDate' => SCHAC_NEW_NS.'schacExpiryDate',
+ SCHAC_OLD_NS.'schacGender' => SCHAC_NEW_NS.'schacGender',
+ SCHAC_OLD_NS.'schacHomeOrganization' => SCHAC_NEW_NS.'schacHomeOrganization',
+ SCHAC_OLD_NS.'schacHomeOrganizationType' => SCHAC_NEW_NS.'schacHomeOrganizationType',
+ SCHAC_OLD_NS.'schacMotherTongue' => SCHAC_NEW_NS.'schacMotherTongue',
+ SCHAC_OLD_NS.'schacPersonalPosition' => SCHAC_NEW_NS.'schacPersonalPosition',
+ SCHAC_OLD_NS.'schacPersonalTitle' => SCHAC_NEW_NS.'schacPersonalTitle',
+ SCHAC_OLD_NS.'schacPersonalUniqueCode' => SCHAC_NEW_NS.'schacPersonalUniqueCode',
+ SCHAC_OLD_NS.'schacPersonalUniqueID' => SCHAC_NEW_NS.'schacPersonalUniqueID',
+ SCHAC_OLD_NS.'schacPlaceOfBirth' => SCHAC_NEW_NS.'schacPlaceOfBirth',
+ SCHAC_OLD_NS.'schacProjectMembership' => SCHAC_NEW_NS.'schacProjectMembership',
+ SCHAC_OLD_NS.'schacProjectSpecificRole' => SCHAC_NEW_NS.'schacProjectSpecificRole',
+ SCHAC_OLD_NS.'schacSn1' => SCHAC_NEW_NS.'schacSn1',
+ SCHAC_OLD_NS.'schacSn2' => SCHAC_NEW_NS.'schacSn2',
+ SCHAC_OLD_NS.'schacUserPresenceID' => SCHAC_NEW_NS.'schacUserPresenceID',
+ SCHAC_OLD_NS.'schacUserPrivateAttribute' => SCHAC_NEW_NS.'schacUserPrivateAttribute',
+ SCHAC_OLD_NS.'schacUserStatus' => SCHAC_NEW_NS.'schacUserStatus',
+);
diff --git a/attributemap/oid2name.php b/attributemap/oid2name.php
index 459d3ae31f0363713906cc9c20e564a8143d0f6f..e38ca344e87bddd409cd659c5bc2f90cdc0c38b8 100644
--- a/attributemap/oid2name.php
+++ b/attributemap/oid2name.php
@@ -78,7 +78,26 @@ $attributemap = array(
'urn:oid:1.3.6.1.4.1.5923.1.2.1.5' => 'eduOrgSuperiorURI',
'urn:oid:1.3.6.1.4.1.5923.1.2.1.6' => 'eduOrgWhitePagesURI',
'urn:oid:1.3.6.1.4.1.5923.1.5.1.1' => 'isMemberOf',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.1' => 'schacMotherTongue',
'urn:oid:1.3.6.1.4.1.25178.1.2.2' => 'schacGender',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.3' => 'schacDateOfBirth',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.4' => 'schacPlaceOfBirth',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.5' => 'schacCountryOfCitizenship',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.6' => 'schacSn1',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.7' => 'schacSn2',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.8' => 'schacPersonalTitle',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'schacHomeOrganization',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.10' => 'schacHomeOrganizationType',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.11' => 'schacCountryOfResidence',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.12' => 'schacUserPresenceID',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.13' => 'schacPersonalPosition',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'schacPersonalUniqueCode',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.15' => 'schacPersonalUniqueID',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.17' => 'schacExpiryDate',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.18' => 'schacUserPrivateAttribute',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.19' => 'schacUserStatus',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.20' => 'schacProjectMembership',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.21' => 'schacProjectSpecificRole',
'urn:oid:2.16.840.1.113730.3.1.1' => 'carLicense',
'urn:oid:2.16.840.1.113730.3.1.2' => 'departmentNumber',
'urn:oid:2.16.840.1.113730.3.1.216' => 'userPKCS12',
@@ -143,7 +162,4 @@ $attributemap = array(
'urn:oid:2.5.4.7' => 'l',
'urn:oid:2.5.4.8' => 'st',
'urn:oid:2.5.4.9' => 'street',
- 'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'schacHomeOrganization',
- 'urn:oid:1.3.6.1.4.1.25178.1.2.10' => 'schacHomeOrganizationType',
- 'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'schacPersonalUniqueCode',
);
diff --git a/attributemap/oid2urn.php b/attributemap/oid2urn.php
index 149fd3f2bce9729b5d4fa96d7fc37053a54b1af8..3ddfc472cd6fe32685c396dfb1b6483b1c8955ee 100644
--- a/attributemap/oid2urn.php
+++ b/attributemap/oid2urn.php
@@ -77,9 +77,26 @@ $attributemap = array(
'urn:oid:1.3.6.1.4.1.5923.1.2.1.4' => 'urn:mace:dir:attribute-def:eduOrgLegalName',
'urn:oid:1.3.6.1.4.1.5923.1.2.1.5' => 'urn:mace:dir:attribute-def:eduOrgSuperiorURI',
'urn:oid:1.3.6.1.4.1.5923.1.2.1.6' => 'urn:mace:dir:attribute-def:eduOrgWhitePagesURI',
- 'urn:oid:1.3.6.1.4.1.25178.1.2.2' => 'urn:mace:dir:attribute-def:schacGender',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.1' => 'urn:mace:terena.org:attribute-def:schacMotherTongue',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.2' => 'urn:mace:terena.org:attribute-def:schacGender',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.3' => 'urn:mace:terena.org:attribute-def:schacDateOfBirth',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.4' => 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.5' => 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.6' => 'urn:mace:terena.org:attribute-def:schacSn1',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.7' => 'urn:mace:terena.org:attribute-def:schacSn2',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.8' => 'urn:mace:terena.org:attribute-def:schacPersonalTitle',
'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
'urn:oid:1.3.6.1.4.1.25178.1.2.10' => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.11' => 'urn:mace:terena.org:attribute-def:schacCountryOfResidence',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.12' => 'urn:mace:terena.org:attribute-def:schacUserPresenceID',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.13' => 'urn:mace:terena.org:attribute-def:schacPersonalPosition',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.15' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.17' => 'urn:mace:terena.org:attribute-def:schacExpiryDate',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.18' => 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.19' => 'urn:mace:terena.org:attribute-def:schacUserStatus',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.20' => 'urn:mace:terena.org:attribute-def:schacProjectMembership',
+ 'urn:oid:1.3.6.1.4.1.25178.1.2.21' => 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole',
'urn:oid:2.16.840.1.113730.3.1.1' => 'urn:mace:dir:attribute-def:carLicense',
'urn:oid:2.16.840.1.113730.3.1.2' => 'urn:mace:dir:attribute-def:departmentNumber',
'urn:oid:2.16.840.1.113730.3.1.216' => 'urn:mace:dir:attribute-def:userPKCS12',
diff --git a/attributemap/urn2name.php b/attributemap/urn2name.php
index 692518dc87e2708a17c86c2320fe36f0388e50f6..89dee4dec640696fefa3b212b7095796d5fc61f1 100644
--- a/attributemap/urn2name.php
+++ b/attributemap/urn2name.php
@@ -163,6 +163,24 @@ $attributemap = array(
'urn:mace:dir:attribute-def:userid' => 'userid',
'urn:mace:dir:attribute-def:x121Address' => 'x121Address',
'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'x500UniqueIdentifier',
+ 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship' => 'schacCountryOfCitizenship',
+ 'urn:mace:terena.org:attribute-def:schacCountryOfResidence' => 'schacCountryOfResidence',
+ 'urn:mace:terena.org:attribute-def:schacDateOfBirth' => 'schacDateOfBirth',
+ 'urn:mace:terena.org:attribute-def:schacExpiryDate' => 'schacExpiryDate',
+ 'urn:mace:terena.org:attribute-def:schacGender' => 'schacGender',
'urn:mace:terena.org:attribute-def:schacHomeOrganization' => 'schacHomeOrganization',
'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'schacHomeOrganizationType',
+ 'urn:mace:terena.org:attribute-def:schacMotherTongue' => 'schacMotherTongue',
+ 'urn:mace:terena.org:attribute-def:schacPersonalPosition' => 'schacPersonalPosition',
+ 'urn:mace:terena.org:attribute-def:schacPersonalTitle' => 'schacPersonalTitle',
+ 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode' => 'schacPersonalUniqueCode',
+ 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID' => 'schacPersonalUniqueID',
+ 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth' => 'schacPlaceOfBirth',
+ 'urn:mace:terena.org:attribute-def:schacProjectMembership' => 'schacProjectMembership',
+ 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole' => 'schacProjectSpecificRole',
+ 'urn:mace:terena.org:attribute-def:schacSn1' => 'schacSn1',
+ 'urn:mace:terena.org:attribute-def:schacSn2' => 'schacSn2',
+ 'urn:mace:terena.org:attribute-def:schacUserPresenceID' => 'schacUserPresenceID',
+ 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute' => 'schacUserPrivateAttribute',
+ 'urn:mace:terena.org:attribute-def:schacUserStatus' => 'schacUserStatus',
);
diff --git a/attributemap/urn2oid.php b/attributemap/urn2oid.php
index 84ba19a12dc5fddd517285b641f50cc3bef98cef..1cb48aa83d338b9e16d0fca6e7ca18006595131c 100644
--- a/attributemap/urn2oid.php
+++ b/attributemap/urn2oid.php
@@ -129,7 +129,6 @@ $attributemap = array(
'urn:mace:dir:attribute-def:roleOccupant' => 'urn:oid:2.5.4.33',
'urn:mace:dir:attribute-def:roomNumber' => 'urn:oid:0.9.2342.19200300.100.1.6',
'urn:mace:dir:attribute-def:sOARecord' => 'urn:oid:0.9.2342.19200300.100.1.30',
- 'urn:mace:dir:attribute-def:schacGender' => 'urn:oid:1.3.6.1.4.1.25178.1.2.2',
'urn:mace:dir:attribute-def:searchGuide' => 'urn:oid:2.5.4.14',
'urn:mace:dir:attribute-def:secretary' => 'urn:oid:0.9.2342.19200300.100.1.21',
'urn:mace:dir:attribute-def:seeAlso' => 'urn:oid:2.5.4.34',
@@ -163,6 +162,24 @@ $attributemap = array(
'urn:mace:dir:attribute-def:userid' => 'urn:oid:0.9.2342.19200300.100.1.1',
'urn:mace:dir:attribute-def:x121Address' => 'urn:oid:2.5.4.24',
'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
+ 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship' => 'urn:oid:1.3.6.1.4.1.25178.1.2.5',
+ 'urn:mace:terena.org:attribute-def:schacCountryOfResidence' => 'urn:oid:1.3.6.1.4.1.25178.1.2.11',
+ 'urn:mace:terena.org:attribute-def:schacDateOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.3',
+ 'urn:mace:terena.org:attribute-def:schacExpiryDate' => 'urn:oid:1.3.6.1.4.1.25178.1.2.17',
+ 'urn:mace:terena.org:attribute-def:schacGender' => 'urn:oid:1.3.6.1.4.1.25178.1.2.2',
'urn:mace:terena.org:attribute-def:schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
+ 'urn:mace:terena.org:attribute-def:schacMotherTongue' => 'urn:oid:1.3.6.1.4.1.25178.1.2.1',
+ 'urn:mace:terena.org:attribute-def:schacPersonalPosition' => 'urn:oid:1.3.6.1.4.1.25178.1.2.13',
+ 'urn:mace:terena.org:attribute-def:schacPersonalTitle' => 'urn:oid:1.3.6.1.4.1.25178.1.2.8',
+ 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
+ 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.15',
+ 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.4',
+ 'urn:mace:terena.org:attribute-def:schacProjectMembership' => 'urn:oid:1.3.6.1.4.1.25178.1.2.20',
+ 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole' => 'urn:oid:1.3.6.1.4.1.25178.1.2.21',
+ 'urn:mace:terena.org:attribute-def:schacSn1' => 'urn:oid:1.3.6.1.4.1.25178.1.2.6',
+ 'urn:mace:terena.org:attribute-def:schacSn2' => 'urn:oid:1.3.6.1.4.1.25178.1.2.7',
+ 'urn:mace:terena.org:attribute-def:schacUserPresenceID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.12',
+ 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute' => 'urn:oid:1.3.6.1.4.1.25178.1.2.18',
+ 'urn:mace:terena.org:attribute-def:schacUserStatus' => 'urn:oid:1.3.6.1.4.1.25178.1.2.19',
);
diff --git a/docs/simplesamlphp-changelog.txt b/docs/simplesamlphp-changelog.txt
index 4bd9f226715c59315c0baff66b75057c45715ddb..d45d3be42450cc0b3a7be5b2fc33259d5010d33b 100644
--- a/docs/simplesamlphp-changelog.txt
+++ b/docs/simplesamlphp-changelog.txt
@@ -26,6 +26,7 @@ Released TBD
* Added support for file uploads in the metadata converter.
* Added support for the Hide From Discovery REFEDS Entity Category.
* Added support for the eduPersonAssurance attribute.
+ * Added support for the full SCHAC 1.5.0 schema.
* Added the SAML NameID to the attributes status page, when available.
* Added attribute definitions for schacGender (schac), sisSchoolGrade and sisLegalGuardianFor (skolfederation.se).
* Attributes required in metadata are now taken into account when parsing.