From f0418a160000df9b79e67fd9bf468831889d3e41 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 16 Dec 2008 08:48:01 +0100 Subject: s4:setup: don't set objectCategory: CN=Domain-DNS,${SCHEMADN} Signed-off-by: Stefan Metzmacher --- source4/setup/provision_basedn_modify.ldif | 3 --- 1 file changed, 3 deletions(-) (limited to 'source4/setup') diff --git a/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif index a7b501e8a8..7b13a193cb 100644 --- a/source4/setup/provision_basedn_modify.ldif +++ b/source4/setup/provision_basedn_modify.ldif @@ -61,9 +61,6 @@ uASCompat: 1 replace: modifiedCount modifiedCount: 1 - -replace: objectCategory -objectCategory: CN=Domain-DNS,${SCHEMADN} -- replace: fSMORoleOwner fSMORoleOwner: CN=NTDS Settings,${SERVERDN} - -- cgit From 74f304ec30d2c6e1d6693beb69da3e98852d62ed Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 16 Dec 2008 08:48:44 +0100 Subject: s4:setup: fix cut-n-paste error Builtin-Domain => Samba4-Local-Domain Signed-off-by: Stefan Metzmacher --- source4/setup/schema_samba4.ldif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/setup') diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index c27157d713..d42795b94d 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -244,7 +244,7 @@ systemAuxiliaryClass: samDomain defaultSecurityDescriptor: D:(A;;RPLCLORC;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU) systemFlags: 16 defaultHidingValue: TRUE -defaultObjectCategory: CN=Builtin-Domain,${SCHEMADN} +defaultObjectCategory: CN=Samba4-Local-Domain,${SCHEMADN} dn: CN=Samba4Top,${SCHEMADN} -- cgit From ebe1e923c862798602b563211ec8c625fc4032ea Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 16 Dec 2008 09:18:21 +0100 Subject: s4:provision: use extended_dn_out_ldb or extended_dn_out_dereference depending on the backend This just changes the existing stratagy of loading different modules for the OpenLDAP backend to also include extended_dn_out_* When we provision the OpenLDAP backend, we make sure to include the 'deref' overlay (which must be made available by the OpenLDAP build) Signed-off-by: Stefan Metzmacher --- source4/setup/slapd.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/setup') diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index b64d581e0d..506dc504b4 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -51,6 +51,8 @@ defaultsearchbase ${DOMAINDN} rootdn cn=Manager +overlay deref + ${REFINT_CONFIG} ${MEMBEROF_CONFIG} -- cgit From f52fc2f90ebf314de71f7150093bd641c3989b3c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 19 Dec 2008 09:47:59 +1100 Subject: Move aggregate schema stub to it's own file This should make it easier to import just the schema entries from the WSPP docs. Andrew Bartlett --- source4/setup/aggregate_schema.ldif | 3 +++ source4/setup/schema.ldif | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 source4/setup/aggregate_schema.ldif (limited to 'source4/setup') diff --git a/source4/setup/aggregate_schema.ldif b/source4/setup/aggregate_schema.ldif new file mode 100644 index 0000000000..2726704719 --- /dev/null +++ b/source4/setup/aggregate_schema.ldif @@ -0,0 +1,3 @@ +dn: CN=Aggregate,${SCHEMADN} +objectClass: top +objectClass: subSchema diff --git a/source4/setup/schema.ldif b/source4/setup/schema.ldif index 40ef709ac3..56eb7ce0c0 100644 --- a/source4/setup/schema.ldif +++ b/source4/setup/schema.ldif @@ -10373,6 +10373,3 @@ systemFlags: 16 defaultHidingValue: TRUE defaultObjectCategory: CN=Group-Policy-Container,${SCHEMADN} -dn: CN=Aggregate,${SCHEMADN} -objectClass: top -objectClass: subSchema -- cgit