diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-11 09:54:22 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-11 09:54:22 +1100 |
| commit | 3688b7669a03ae9e5166f12ab9e1a82f066002c7 (patch) | |
| tree | a9cc87732ba35350719810e344c3ed7464b9e7fe | |
| parent | 80902a2a2b14bc27af0f195d18c40ccef9cb780c (diff) | |
| download | samba-3688b7669a03ae9e5166f12ab9e1a82f066002c7.tar.gz samba-3688b7669a03ae9e5166f12ab9e1a82f066002c7.tar.bz2 samba-3688b7669a03ae9e5166f12ab9e1a82f066002c7.zip | |
Make Samba4 and Fedora DS happier
Recent changes to Samba4 have made the Fedora DS backend fail. This
is a start on fixing that.
Andrew Bartlett
(This used to be commit 48dc07902ffb792532ff216e507e53103d448b7b)
| -rw-r--r-- | source4/setup/fedorads-partitions.ldif | 2 | ||||
| -rw-r--r-- | source4/setup/schema-map-fedora-ds-1.0 | 2 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 20 |
3 files changed, 24 insertions, 0 deletions
diff --git a/source4/setup/fedorads-partitions.ldif b/source4/setup/fedorads-partitions.ldif index 12855f9c70..571fb599b9 100644 --- a/source4/setup/fedorads-partitions.ldif +++ b/source4/setup/fedorads-partitions.ldif @@ -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} diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0 index 7419a8d7b8..86f8c0b726 100644 --- a/source4/setup/schema-map-fedora-ds-1.0 +++ b/source4/setup/schema-map-fedora-ds-1.0 @@ -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 diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index a9f79f1635..8bd1705468 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -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 + |