diff options
| author | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
| commit | 4283ae489b6e227beba196e8a315a9727f03cc07 (patch) | |
| tree | 7308561653b9e52eab8fc13181c0ad41ae2da208 /source4/setup | |
| parent | f9bb8fbe832409893b17f2113d7b35b9ffe91540 (diff) | |
| parent | d031472227b44d040698e6dff52dc79028fde854 (diff) | |
| download | samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.gz samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.bz2 samba-4283ae489b6e227beba196e8a315a9727f03cc07.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/aggregate_schema.ldif | 3 | ||||
| -rw-r--r-- | source4/setup/provision_basedn_modify.ldif | 3 | ||||
| -rw-r--r-- | source4/setup/schema.ldif | 3 | ||||
| -rw-r--r-- | source4/setup/schema_samba4.ldif | 2 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 2 |
5 files changed, 6 insertions, 7 deletions
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/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} - 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 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} 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} |