r4400: Pass rootdse.ldif past the subst code.

Andrew Bartlett
(This used to be commit d901c8fb64440fd8f966cc3d8929bb63551019fd)

diff --git a/source4/script/provision.pl b/source4/script/provision.pl
index 0940a3e30fd9e563b5273bac8f9121a7f026a7f9..2dd37bed12149f7357ff991450e6806bf31beb3d 100755 (executable)
--- a/source4/script/provision.pl
+++ b/source4/script/provision.pl
@@ -364,11 +364,28 @@ system("ldbadd -H newsam.ldb newsam.ldif");
 
 print "done\n";
 
+$data = FileLoad("rootdse.ldif") || die "Unable to load rootdse.ldif\n";
+
+$res = "";
+
+print "applying substitutions ...\n";
+
+while ($data =~ /(.*?)\$\{(\w*)\}(.*)/s) {
+       my $sub = substitute($2);
+       $res .= "$1$sub";
+       $data = $3;
+}
+$res .= $data;
+
+print "saving ldif to newrootdse.ldif ...\n";
+
+FileSave("newrootdse.ldif", $res);
+
 unlink("newrootdse.ldb");
 
 print "creating newrootdse.ldb ...\n";
 
-system("ldbadd -H newrootdse.ldb rootdse.ldif");
+system("ldbadd -H newrootdse.ldb newrootdse.ldif");
 
 print "done\n";
 
@@ -408,6 +425,8 @@ Installation:
   Samba4 installation
 - Please move newrootdse.ldb to rootdse.ldb in the private/ directory
   of your Samba4 installation
+- Please move newhklm.ldb to hklm.ldb in the private/ directory
+  of your Samba4 installation
 - Please use $dnsdomain.zone to in BIND dns server
 ";