svn commit: samba r22531 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules setup

[abartlet at samba.org]

Author: abartlet
Date: 2007-04-27 11:13:37 +0000 (Fri, 27 Apr 2007)
New Revision: 22531

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

Log:
Fix up OpenLDAP schema map to almost pass 'make test'.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c
   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/dsdb/samdb/ldb_modules/entryUUID.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c	2007-04-27 10:06:34 UTC (rev 22530)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c	2007-04-27 11:13:37 UTC (rev 22531)
@@ -356,11 +356,29 @@
 		.type = MAP_RENAME,
 		.u = {
 			.rename = {
-				 .remote_name = "sambaObjectClasses"
+				 .remote_name = "samba4ObjectClasses"
 			 }
 		}
 	},
 	{
+		.local_name = "dITContentRules",
+		.type = MAP_RENAME,
+		.u = {
+			.rename = {
+				 .remote_name = "samba4DITContentRules"
+			 }
+		}
+	},
+	{
+		.local_name = "attributeTypes",
+		.type = MAP_RENAME,
+		.u = {
+			.rename = {
+				 .remote_name = "samba4AttributeTypes"
+			 }
+		}
+	},
+	{
 		.local_name = "sambaPassword",
 		.type = MAP_RENAME,
 		.u = {

Modified: branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3
===================================================================
--- branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3	2007-04-27 10:06:34 UTC (rev 22530)
+++ branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3	2007-04-27 11:13:37 UTC (rev 22531)
@@ -2,7 +2,6 @@
 name
 labeledURI
 createTimeStamp
-attributeTypes
 objectClass
 userPassword
 seeAlso
@@ -12,11 +11,14 @@
 distinguishedName
 description
 cn
-dITContentRules
 top
 #This shouldn't make it to the ldap server
 sambaPassword
 #These conflict with OpenLDAP builtins
+attributeTypes:samba4AttributeTypes
+2.5.21.5:1.3.6.1.4.1.7165.4.255.7
+dITContentRules:samba4DITContentRules
+2.5.21.2:1.3.6.1.4.1.7165.4.255.6
 objectClasses:samba4ObjectClasses
 2.5.21.6:1.3.6.1.4.1.7165.4.255.5
 subSchema:samba4SubSchema

Modified: branches/SAMBA_4_0/source/setup/schema_samba4.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/schema_samba4.ldif	2007-04-27 10:06:34 UTC (rev 22530)
+++ branches/SAMBA_4_0/source/setup/schema_samba4.ldif	2007-04-27 11:13:37 UTC (rev 22531)
@@ -169,3 +169,5 @@
 #Allocated: (modifyTimestamp) samba4ModifyTimestamp: 1.3.6.1.4.1.7165.4.255.3
 #Allocated: (subSchema) samba4SubSchema: 1.3.6.1.4.1.7165.4.255.4
 #Allocated: (objectClasses) samba4ObjectClasses: 1.3.6.1.4.1.7165.4.255.5
+#Allocated: (ditContentRules) samba4DitContentRules: 1.3.6.1.4.1.7165.4.255.6
+#Allocated: (attributeTypes) samba4AttributeTypes: 1.3.6.1.4.1.7165.4.255.7