From e350ca0bcbc76d4298a4c24ccef9e430ba75b8a8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 Oct 2006 12:29:31 +0000 Subject: r19336: Merge from release branch: new Mapped OIDs, in own subtree. Andrew Bartlett (This used to be commit ac5abff4b66619c29357adb7e013700bdf686709) --- source4/setup/schema_samba4.ldif | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/setup/schema_samba4.ldif') diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index 4efcfc4c12..383ebb0edb 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -4,6 +4,7 @@ ## Samba4 OID allocation from Samba3's examples/LDAP/samba.schema ## 1.3.6.1.4.1.7165.4.1.x - attributetypes ## 1.3.6.1.4.1.7165.4.2.x - objectclasses +## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track # # @@ -113,8 +114,6 @@ attributeID: 1.3.6.1.4.1.7165.4.1.7 attributeSyntax: 2.5.5.4 oMSyntax: 20 -#Allocated: (middleName) attributeID: 1.3.6.1.4.1.7165.4.1.7 - dn: CN=unixName,CN=Schema,CN=Configuration,${BASEDN} cn: unixName @@ -147,4 +146,6 @@ attributeSyntax: 2.5.5.10 oMSyntax: 4 -#Allocated: (defaultGroup) attributeID: 1.3.6.1.4.1.7165.4.1.11 +#Allocated: (middleName) attributeID: 1.3.6.1.4.1.7165.4.255.1 + +#Allocated: (defaultGroup) attributeID: 1.3.6.1.4.1.7165.4.255.2 -- cgit