summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-01-05 20:58:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:37:02 -0500
commitd0e221c4e097b53184ad4a877a1d062eaa10390c (patch)
tree94b1f185858de96ff60731dbbca0785b562e4bf9
parenta7bc3801f94891880a90b2974dfbadc9e9f8c2ee (diff)
downloadsamba-d0e221c4e097b53184ad4a877a1d062eaa10390c.tar.gz
samba-d0e221c4e097b53184ad4a877a1d062eaa10390c.tar.bz2
samba-d0e221c4e097b53184ad4a877a1d062eaa10390c.zip
r20568: split out the rootdse ldif
and set the isSyncronized = TRUE when we done metze (This used to be commit 5875ce1ac6ff694d07787ff0cf81b3429580311b)
-rw-r--r--source4/scripting/libjs/provision.js10
-rw-r--r--source4/setup/provision_init.ldif20
-rw-r--r--source4/setup/provision_rootdse_add.ldif18
-rw-r--r--source4/setup/provision_rootdse_modify.ldif5
4 files changed, 33 insertions, 20 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 731f95c6de..772505f569 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/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/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif
index bea45ce4ee..1e2f660789 100644
--- a/source4/setup/provision_init.ldif
+++ b/source4/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/source4/setup/provision_rootdse_add.ldif b/source4/setup/provision_rootdse_add.ldif
new file mode 100644
index 0000000000..53fdf3c761
--- /dev/null
+++ b/source4/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/source4/setup/provision_rootdse_modify.ldif b/source4/setup/provision_rootdse_modify.ldif
new file mode 100644
index 0000000000..5ccda79b7a
--- /dev/null
+++ b/source4/setup/provision_rootdse_modify.ldif
@@ -0,0 +1,5 @@
+# mark the database as syncronized
+dn: cn=ROOTDSE
+changetype: modify
+replace: isSynchronized
+isSynchronized: TRUE