r20568: split out the rootdse ldif

and set the isSyncronized = TRUE when we done

metze

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index 731f95c6de404701e6f05cb36c5b6789348982a8..772505f569e0d5f19ef4f1180ebf847247e9e772 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -499,6 +499,10 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
 
        message("Setting up sam.ldb attributes\n");
        setup_add_ldif("provision_init.ldif", info, samdb, false);
+
+       message("Setting up sam.ldb rootDSE\n");
+       setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
+
        message("Erasing data from partitions\n");
        ldb_erase_partitions(info, samdb, ldapbackend);
        
@@ -566,6 +570,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
                message("Setting up sam.ldb index\n");
                setup_add_ldif("provision_index.ldif", info, samdb, false);
 
+               message("Setting up sam.ldb rootDSE marking as syncronized\n");
+               setup_modify_ldif("provision_rootdse_modify.ldif", info, samdb, false);
+
                var commit_ok = samdb.transaction_commit();
                if (!commit_ok) {
                        info.message("ldb commit failed: " + samdb.errstring() + "\n");
@@ -597,6 +604,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
        message("Setting up sam.ldb index\n");
        setup_add_ldif("provision_index.ldif", info, samdb, false);
 
+       message("Setting up sam.ldb rootDSE marking as syncronized\n");
+       setup_modify_ldif("provision_rootdse_modify.ldif", info, samdb, false);
+
        var commit_ok = samdb.transaction_commit();
        if (!commit_ok) {
                info.message("samdb commit failed: " + samdb.errstring() + "\n");

diff --git a/source/setup/provision_init.ldif b/source/setup/provision_init.ldif
index bea45ce4eea071510393eecde344d8f9ec98d7cd..1e2f66078968f88436eb49dae9a37adea6a2592b 100644 (file)
--- a/source/setup/provision_init.ldif
+++ b/source/setup/provision_init.ldif
@@ -41,23 +41,3 @@ passwordAttribute: sambaNTPwdHistory
 passwordAttribute: lmPwdHash
 passwordAttribute: sambaLMPwdHistory
 passwordAttribute: krb5key
-
-# the rootDSE module looks in this record for its base data
-dn: cn=ROOTDSE
-subschemaSubentry: CN=Aggregate,${SCHEMADN}
-dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
-defaultNamingContext: ${DOMAINDN}
-rootDomainNamingContext: ${ROOTDN}
-configurationNamingContext: ${CONFIGDN}
-schemaNamingContext: ${SCHEMADN}
-supportedLDAPVersion: 3
-dnsHostName: ${DNSNAME}
-ldapServiceName: ${DNSDOMAIN}:${NETBIOSNAME}$@${REALM}
-serverName: CN=${NETBIOSNAME},CN=Servers,${DEFAULTSITE},CN=Sites,${CONFIGDN}
-domainFunctionality: 0
-forestFunctionality: 0
-domainControllerFunctionality: 2
-isSynchronized: TRUE
-vendorName: Samba Team (http://samba.org)
-vendorVersion: ${VERSION}
-

diff --git a/source/setup/provision_rootdse_add.ldif b/source/setup/provision_rootdse_add.ldif
new file mode 100644 (file)
index 0000000..53fdf3c
--- /dev/null
+++ b/source/setup/provision_rootdse_add.ldif
@@ -0,0 +1,18 @@
+# the rootDSE module looks in this record for its base data
+dn: cn=ROOTDSE
+subschemaSubentry: CN=Aggregate,${SCHEMADN}
+dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
+defaultNamingContext: ${DOMAINDN}
+rootDomainNamingContext: ${ROOTDN}
+configurationNamingContext: ${CONFIGDN}
+schemaNamingContext: ${SCHEMADN}
+supportedLDAPVersion: 3
+dnsHostName: ${DNSNAME}
+ldapServiceName: ${DNSDOMAIN}:${NETBIOSNAME}$@${REALM}
+serverName: CN=${NETBIOSNAME},CN=Servers,${DEFAULTSITE},CN=Sites,${CONFIGDN}
+domainFunctionality: 0
+forestFunctionality: 0
+domainControllerFunctionality: 2
+isSynchronized: FALSE
+vendorName: Samba Team (http://samba.org)
+vendorVersion: ${VERSION}

diff --git a/source/setup/provision_rootdse_modify.ldif b/source/setup/provision_rootdse_modify.ldif
new file mode 100644 (file)
index 0000000..5ccda79
--- /dev/null
+++ b/source/setup/provision_rootdse_modify.ldif
@@ -0,0 +1,5 @@
+# mark the database as syncronized
+dn: cn=ROOTDSE
+changetype: modify
+replace: isSynchronized
+isSynchronized: TRUE