Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:55:28 +0000 (09:55 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:55:28 +0000 (09:55 +1100)
(This used to be commit 588531bf211f5ede2731df56fd540934b673a2d7)

source4/setup/fedorads-partitions.ldif
source4/setup/schema-map-fedora-ds-1.0
source4/setup/schema_samba4.ldif

index 12855f9c702e1829a69dbc9adfac37fc882928e4..571fb599b9a8fa60c7e537f8ec3882e75360a363 100644 (file)
@@ -7,6 +7,7 @@ nsslapd-backend: configData
 cn: ${CONFIGDN}
 
 dn: cn=configData,cn=ldbm database,cn=plugins,cn=config
+objectclass: top
 objectclass: extensibleObject
 objectclass: nsBackendInstance
 nsslapd-suffix: ${CONFIGDN}
@@ -21,6 +22,7 @@ nsslapd-backend: schemaData
 cn: ${SCHEMADN}
 
 dn: cn=schemaData,cn=ldbm database,cn=plugins,cn=config
+objectclass: top
 objectclass: extensibleObject
 objectclass: nsBackendInstance
 nsslapd-suffix: ${SCHEMADN}
index 7419a8d7b887c59fb9190d35bbc77a8a614d789b..86f8c0b7269c21e7c9d75fec4f5f76a08617a17a 100644 (file)
@@ -14,6 +14,8 @@ dITContentRules
 top
 #This shouldn't make it to the ldap server
 sambaPassword
+#This should be provided by the LDAP server, only in our schema to permit provision
+aci
 #Skip ObjectClasses
 #MiddleName has a conflicting OID
 2.16.840.1.113730.3.1.34:1.3.6.1.4.1.7165.4.255.1
index a9f79f1635d7bebf83765c7cda67a50a2e5c351e..8bd17054687bf99f5e7938208bd26b4bd033caa2 100644 (file)
@@ -174,3 +174,23 @@ oMSyntax: 20
 #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
+
+
+#
+# Fedora DS uses this attribute, and we need to set it via our module stack
+#
+dn: CN=aci,${SCHEMADN}
+cn: aci
+name: aci
+objectClass: top
+objectClass: attributeSchema
+lDAPDisplayName: aci
+isSingleValued: TRUE
+systemFlags: 16
+systemOnly: FALSE
+schemaIDGUID: d8e6c1fa-db08-4f26-a53b-23c414aac92d
+adminDisplayName: aci
+attributeID: 1.3.6.1.4.1.7165.4.1.11
+attributeSyntax: 2.5.5.4
+oMSyntax: 20
+