svn commit: samba r19336 - in branches/SAMBA_4_0/source/setup: .
abartlet at samba.org
abartlet at samba.org
Mon Oct 16 12:29:32 GMT 2006
Author: abartlet
Date: 2006-10-16 12:29:31 +0000 (Mon, 16 Oct 2006)
New Revision: 19336
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19336
Log:
Merge from release branch: new Mapped OIDs, in own subtree.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0
branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3
branches/SAMBA_4_0/source/setup/schema_samba4.ldif
Changeset:
Modified: branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0
===================================================================
--- branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0 2006-10-16 12:27:08 UTC (rev 19335)
+++ branches/SAMBA_4_0/source/setup/schema-map-fedora-ds-1.0 2006-10-16 12:29:31 UTC (rev 19336)
@@ -15,9 +15,9 @@
#Skip ObjectClasses
#
#MiddleName has a conflicting OID
-2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.1.8
+2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1
#defaultGroup has a conflicting OID
-1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.1.11
+1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.255.2
#This large integer format is unimplemented in OpenLDAP 2.3
1.2.840.113556.1.4.906:1.3.6.1.4.1.1466.115.121.1.27
#This case insensitive string isn't available
Modified: branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3
===================================================================
--- branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2006-10-16 12:27:08 UTC (rev 19335)
+++ branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2006-10-16 12:29:31 UTC (rev 19336)
@@ -20,9 +20,9 @@
subSchema
#
#MiddleName has a conflicting OID
-2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.1.8
+2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1
#defaultGroup has a conflicting OID
-1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.1.11
+1.2.840.113556.1.4.480:1.3.6.1.4.1.7165.4.255.2
#This large integer format is unimplemented in OpenLDAP 2.3
1.2.840.113556.1.4.906:1.3.6.1.4.1.1466.115.121.1.27
#This case insensitive string isn't available
Modified: branches/SAMBA_4_0/source/setup/schema_samba4.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/schema_samba4.ldif 2006-10-16 12:27:08 UTC (rev 19335)
+++ branches/SAMBA_4_0/source/setup/schema_samba4.ldif 2006-10-16 12:29:31 UTC (rev 19336)
@@ -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,9 +114,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
name: unixName
@@ -147,4 +146,6 @@
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
More information about the samba-cvs
mailing list