svn commit: samba r4400 - in branches/SAMBA_4_0/source/script: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-12-29 22:59:28 +0000 (Wed, 29 Dec 2004)
New Revision: 4400

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4400

Log:
Pass rootdse.ldif past the subst code.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/script/provision.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/provision.pl
===================================================================
--- branches/SAMBA_4_0/source/script/provision.pl	2004-12-29 22:57:20 UTC (rev 4399)
+++ branches/SAMBA_4_0/source/script/provision.pl	2004-12-29 22:59:28 UTC (rev 4400)
@@ -364,11 +364,28 @@
 
 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 @@
   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
 ";