summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-08-13 10:01:00 +1000
committerAndrew Bartlett <abartlet@samba.org>2009-08-17 09:50:56 +1000
commite1e99a7c7bb3a69d2c522ef272301b0ba73efd7f (patch)
tree2a055c353226bc746afad7caad1c03083482fa7e
parent346aa6e093508f4e2918b20df452398ef332e416 (diff)
downloadsamba-e1e99a7c7bb3a69d2c522ef272301b0ba73efd7f.tar.gz
samba-e1e99a7c7bb3a69d2c522ef272301b0ba73efd7f.tar.bz2
samba-e1e99a7c7bb3a69d2c522ef272301b0ba73efd7f.zip
s4:provision Remove the ACI element from the provision templates
We need to find a better way to apply this (used in the Fedora DS LDAP backend), not by trying to tunnel this down the module stack. Andrew Bartlett
-rw-r--r--source4/setup/provision_basedn.ldif1
-rw-r--r--source4/setup/provision_configuration_basedn.ldif1
-rw-r--r--source4/setup/provision_schema_basedn.ldif1
-rw-r--r--source4/setup/schema_samba4.ldif28
4 files changed, 14 insertions, 17 deletions
diff --git a/source4/setup/provision_basedn.ldif b/source4/setup/provision_basedn.ldif
index 7fdecfa3c0..df34e4bbf0 100644
--- a/source4/setup/provision_basedn.ldif
+++ b/source4/setup/provision_basedn.ldif
@@ -4,5 +4,4 @@
dn: ${DOMAINDN}
objectClass: top
objectClass: ${DOMAIN_OC}
-${ACI}
diff --git a/source4/setup/provision_configuration_basedn.ldif b/source4/setup/provision_configuration_basedn.ldif
index 575f8faa0a..f009113f10 100644
--- a/source4/setup/provision_configuration_basedn.ldif
+++ b/source4/setup/provision_configuration_basedn.ldif
@@ -4,5 +4,4 @@
dn: ${CONFIGDN}
objectClass: top
objectClass: configuration
-${ACI}
cn: Configuration
diff --git a/source4/setup/provision_schema_basedn.ldif b/source4/setup/provision_schema_basedn.ldif
index fbfd4c09d6..8c7ce88bac 100644
--- a/source4/setup/provision_schema_basedn.ldif
+++ b/source4/setup/provision_schema_basedn.ldif
@@ -4,5 +4,4 @@
dn: ${SCHEMADN}
objectClass: top
objectClass: dMD
-${ACI}
cn: Schema
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index c19fe20ac3..d5d35af7d5 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -196,20 +196,20 @@ oMSyntax: 20
#
# 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
+#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
#
# Based on domainDNS, but without the DNS bits.