Rev 11287: merge upstream in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

------------------------------------------------------------
revno: 11287
revision-id: jelmer at samba.org-20070122181923-bn9u0fbi0qw4lm78
parent: jelmer at samba.org-20070122181648-71ad8zjnj5h4cs4n
parent: svn-v2:20954 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Mon 2007-01-22 19:19:23 +0100
message:
  merge upstream
modified:
  source/scripting/libjs/provision.js svn-v2:8372 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscripting%2flibjs%2fprovision.js
    ------------------------------------------------------------
    revno: 11284.1.2
    merged: svn-v2:20954 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:20953 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
    committer: jelmer
    timestamp: Mon 2007-01-22 18:16:01 +0000
    message:
      Add lcov target, fix gcov.
    ------------------------------------------------------------
    revno: 11284.1.1
    merged: svn-v2:20953 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:20952 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: metze
    timestamp: Mon 2007-01-22 18:15:54 +0000
    message:
      add templates in provision_become_dc()
      
      metze
=== modified file 'source/scripting/libjs/provision.js'
--- a/source/scripting/libjs/provision.js	2007-01-20 10:27:22 +0000
+++ b/source/scripting/libjs/provision.js	2007-01-22 18:15:54 +0000
@@ -481,6 +481,9 @@
 	message("Setting up " + paths.samdb + " indexes\n");
 	setup_add_ldif("provision_index.ldif", info, samdb, false);
 
+	message("Setting up " + paths.samdb + " templates\n");
+	setup_add_ldif("provision_templates.ldif", info, samdb, false);
+
 	ok = samdb.transaction_commit();
 	assert(ok);