From f5860b5a853c40c9e48f5bb0a87c086d268c53bd Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 5 Dec 2007 00:40:48 +0100 Subject: r26298: Use metze's schema loading code to pre-initialise the schema into the samdb before we start writing entries into it. In doing so, I realised we still used 'dnsDomain', which is not part of the standard schema (now removed). We also set the 'wrong' side of the linked attributes for the masteredBy on each partition - this is now set in provision_self_join and backlinks via the linked attributes code. When we have the schema loaded, we must also have a valid domain SID loaded, so that the objectclass module works. This required some ejs glue. Andrew Bartlett (This used to be commit b0de08916e8cb59ce6a2ea94bbc9ac0679830ac1) --- source4/setup/provision_basedn_modify.ldif | 8 ------- .../provision_configuration_basedn_modify.ldif | 6 ----- source4/setup/provision_schema_basedn_modify.ldif | 9 -------- source4/setup/provision_self_join.ldif | 7 +++++- source4/setup/schema_samba4.ldif | 27 ++++++++++++---------- 5 files changed, 21 insertions(+), 36 deletions(-) (limited to 'source4/setup') diff --git a/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif index 286ecdd49c..fa990599d9 100644 --- a/source4/setup/provision_basedn_modify.ldif +++ b/source4/setup/provision_basedn_modify.ldif @@ -3,8 +3,6 @@ ############################### dn: ${DOMAINDN} changetype: modify -replace: dnsDomain -dnsDomain: ${DNSDOMAIN} - replace: dc dc: ${RDN_DC} @@ -79,12 +77,6 @@ replace: subRefs subRefs: ${CONFIGDN} subRefs: ${SCHEMADN} - -replace: masteredBy -masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} -- -replace: msDs-masteredBy -msDs-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} -- replace: gPLink gPLink: [LDAP://CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN};2] - diff --git a/source4/setup/provision_configuration_basedn_modify.ldif b/source4/setup/provision_configuration_basedn_modify.ldif index 897499b163..46ba4e9649 100644 --- a/source4/setup/provision_configuration_basedn_modify.ldif +++ b/source4/setup/provision_configuration_basedn_modify.ldif @@ -14,9 +14,3 @@ objectCategory: CN=Configuration,${SCHEMADN} - replace: subRefs subRefs: ${SCHEMADN} -- -replace: masteredBy -masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} -- -replace: msDs-masteredBy -msDs-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} diff --git a/source4/setup/provision_schema_basedn_modify.ldif b/source4/setup/provision_schema_basedn_modify.ldif index a222a654f7..92c5cf1ace 100644 --- a/source4/setup/provision_schema_basedn_modify.ldif +++ b/source4/setup/provision_schema_basedn_modify.ldif @@ -9,15 +9,6 @@ instanceType: 13 replace: showInAdvancedViewOnly showInAdvancedViewOnly: TRUE - -replace: objectCategory -objectCategory: CN=DMD,${SCHEMADN} -- -replace: masteredBy -masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} -- -replace: msDs-masteredBy -msDs-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} -- replace: fSMORoleOwner fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN} - diff --git a/source4/setup/provision_self_join.ldif b/source4/setup/provision_self_join.ldif index 8c6959dbaa..06230e8d00 100644 --- a/source4/setup/provision_self_join.ldif +++ b/source4/setup/provision_self_join.ldif @@ -61,4 +61,9 @@ systemFlags: 33554432 dMDLocation: ${SCHEMADN} invocationId: ${INVOCATIONID} msDS-Behavior-Version: 2 - +msDS-hasMasterNCs: ${CONFIGDN} +msDS-hasMasterNCs: ${SCHEMADN} +msDS-hasMasterNCs: ${DOMAINDN} +hasMasterNCs: ${CONFIGDN} +hasMasterNCs: ${SCHEMADN} +hasMasterNCs: ${DOMAINDN} diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif index 2967261758..a9f79f1635 100644 --- a/source4/setup/schema_samba4.ldif +++ b/source4/setup/schema_samba4.ldif @@ -96,18 +96,21 @@ attributeID: 1.3.6.1.4.1.7165.4.1.5 attributeSyntax: 2.5.5.5 oMSyntax: 22 -dn: cn=dnsDomain,${SCHEMADN} -objectClass: top -objectClass: attributeSchema -lDAPDisplayName: dnsDomain -isSingleValued: FALSE -systemFlags: 17 -systemOnly: TRUE -schemaIDGUID: A40165E6-5E45-44A7-A8FA-186C94333018 -adminDisplayName: DNS-Domain -attributeID: 1.3.6.1.4.1.7165.4.1.6 -attributeSyntax: 2.5.5.4 -oMSyntax: 20 +# +# Not used anymore +# +#dn: cn=dnsDomain,${SCHEMADN} +#objectClass: top +#objectClass: attributeSchema +#lDAPDisplayName: dnsDomain +#isSingleValued: FALSE +#systemFlags: 17 +#systemOnly: TRUE +#schemaIDGUID: A40165E6-5E45-44A7-A8FA-186C94333018 +#adminDisplayName: DNS-Domain +#attributeID: 1.3.6.1.4.1.7165.4.1.6 +#attributeSyntax: 2.5.5.4 +#oMSyntax: 20 dn: cn=privilege,${SCHEMADN} objectClass: top -- cgit