The branch, v4-0-test has been updated
via 588531bf211f5ede2731df56fd540934b673a2d7 (commit)
via 48dc07902ffb792532ff216e507e53103d448b7b (commit)
from ff14ffc6582874d8248798bebd57703fbdbda942 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 588531bf211f5ede2731df56fd540934b673a2d7
Merge: 48dc07902ffb792532ff216e507e53103d448b7b
ff14ffc6582874d8248798bebd57703fbdbda942
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Jan 11 09:55:28 2008 +1100
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
commit 48dc07902ffb792532ff216e507e53103d448b7b
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Jan 11 09:54:22 2008 +1100
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
-----------------------------------------------------------------------
Summary of changes:
source/setup/fedorads-partitions.ldif | 2 ++
source/setup/schema-map-fedora-ds-1.0 | 2 ++
source/setup/schema_samba4.ldif | 20 ++++++++++++++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/setup/fedorads-partitions.ldif
b/source/setup/fedorads-partitions.ldif
index 12855f9..571fb59 100644
--- a/source/setup/fedorads-partitions.ldif
+++ b/source/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/source/setup/schema-map-fedora-ds-1.0
b/source/setup/schema-map-fedora-ds-1.0
index 7419a8d..86f8c0b 100644
--- a/source/setup/schema-map-fedora-ds-1.0
+++ b/source/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/source/setup/schema_samba4.ldif b/source/setup/schema_samba4.ldif
index a9f79f1..8bd1705 100644
--- a/source/setup/schema_samba4.ldif
+++ b/source/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
+
--
Samba Shared Repository
