svn commit: samba r19335 - in branches/SAMBA_4_0_RELEASE/source/setup: .

abartlet at samba.org abartlet at samba.org
Mon Oct 16 12:27:10 GMT 2006


Author: abartlet
Date: 2006-10-16 12:27:08 +0000 (Mon, 16 Oct 2006)
New Revision: 19335

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19335

Log:
Move 'mapped' OIDs into their own subtree in the OID space


Modified:
   branches/SAMBA_4_0_RELEASE/source/setup/schema-map-openldap-2.3
   branches/SAMBA_4_0_RELEASE/source/setup/schema_samba4.ldif


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/setup/schema-map-openldap-2.3
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/setup/schema-map-openldap-2.3	2006-10-16 12:05:44 UTC (rev 19334)
+++ branches/SAMBA_4_0_RELEASE/source/setup/schema-map-openldap-2.3	2006-10-16 12:27:08 UTC (rev 19335)
@@ -20,7 +20,7 @@
 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
 #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_RELEASE/source/setup/schema_samba4.ldif
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/setup/schema_samba4.ldif	2006-10-16 12:05:44 UTC (rev 19334)
+++ branches/SAMBA_4_0_RELEASE/source/setup/schema_samba4.ldif	2006-10-16 12:27:08 UTC (rev 19335)
@@ -4,8 +4,8 @@
 ## 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
 #
-#
 
 
 dn: cn=ntpwdHash,CN=Schema,CN=Configuration,${BASEDN}



More information about the samba-cvs mailing list