r24947: Forgot to merge this to release branch, so we got weird subs in
[ira/wip.git] / source / scripting / libjs / provision.js
index 90bc08234166a2c2c18b47cd537cc9a55f2eacf7..fd6de2695f3f055955e472009c5b51ea3ed2e29e 100644 (file)
@@ -4,9 +4,6 @@
        Released under the GNU GPL v2 or later
 */
 
-/* used to generate sequence numbers for records */
-provision_next_usn = 1;
-
 sys = sys_init();
 
 /*
@@ -26,7 +23,7 @@ function install_ok(session_info, credentials)
                return false;
        }
        var res = ldb.search("(cn=Administrator)");
-       if (res.length != 1) {
+       if (res.error != 0 || res.msgs.length != 1) {
                return false;
        }
        return true;
@@ -52,20 +49,18 @@ function findnss()
 /*
    add a foreign security principle
  */
-function add_foreign(str, sid, desc)
+function add_foreign(ldb, subobj, sid, desc)
 {
-       var add = "
-dn: CN=${SID},CN=ForeignSecurityPrincipals,${BASEDN}
+       var add = sprintf("
+dn: CN=%s,CN=ForeignSecurityPrincipals,%s
 objectClass: top
 objectClass: foreignSecurityPrincipal
-description: ${DESC}
-uSNCreated: 1
-uSNChanged: 1
-";
-       var sub = new Object();
-       sub.SID = sid;
-       sub.DESC = desc;
-       return str + substitute_var(add, sub);
+description: %s
+",
+                         sid, subobj.DOMAINDN, desc);
+       /* deliberately ignore errors from this, as the records may
+          already exist */
+       ldb.add(add);
 }
 
 
@@ -76,8 +71,9 @@ function setup_name_mapping(info, ldb, sid, unixname)
 {
        var attrs = new Array("dn");
        var res = ldb.search(sprintf("objectSid=%s", sid), 
-                            NULL, ldb.SCOPE_DEFAULT, attrs);
-       if (res.length != 1) {
+                            info.subobj.DOMAINDN, ldb.SCOPE_SUBTREE, attrs);
+       if (res.error != 0 || res.msgs.length != 1) {
+               info.message("Failed to find record for objectSid %s\n", sid);
                return false;
        }
        var mod = sprintf("
@@ -86,9 +82,9 @@ changetype: modify
 replace: unixName
 unixName: %s
 ",
-                         res[0].dn, unixname);
+                         res.msgs[0].dn, unixname);
        var ok = ldb.modify(mod);
-       if (!ok) {
+       if (ok.error != 0) {
                info.message("name mapping for %s failed - %s\n",
                             sid, ldb.errstring());
                return false;
@@ -117,7 +113,7 @@ function ldaptime()
 */
 function datestring()
 {
-       var t = sys.gmtime(sys.nttime());
+       var t = sys.ntgmtime(sys.nttime());
        return sprintf("%04u%02u%02u%02u",
                       t.tm_year+1900, t.tm_mon+1, t.tm_mday, t.tm_hour);
 }
@@ -131,14 +127,6 @@ function hostip()
        return list[0];
 }
 
-/*
-  return next USN in the sequence
-*/
-function nextusn()
-{
-       provision_next_usn = provision_next_usn+1;
-       return provision_next_usn;
-}
 
 /*
   return first part of hostname
@@ -149,13 +137,12 @@ function hostname()
        return s[0];
 }
 
-
 /* the ldb is in bad shape, possibly due to being built from an
    incompatible previous version of the code, so delete it
    completely */
-function ldb_delete(ldb)
+function ldb_delete(info, ldb)
 {
-       println("Deleting " + ldb.filename);
+       info.message("Deleting " + ldb.filename + "\n");
        var lp = loadparm_init();
        sys.unlink(sprintf("%s/%s", lp.get("private dir"), ldb.filename));
        ldb.transaction_cancel();
@@ -168,90 +155,202 @@ function ldb_delete(ldb)
 /*
   erase an ldb, removing all records
 */
-function ldb_erase(ldb)
+function ldb_erase(info, ldb)
 {
-       var attrs = new Array("dn");
+       var res;
 
        /* delete the specials */
        ldb.del("@INDEXLIST");
        ldb.del("@ATTRIBUTES");
        ldb.del("@SUBCLASSES");
        ldb.del("@MODULES");
+       ldb.del("@PARTITION");
+       ldb.del("@KLUDGEACL");
 
        /* and the rest */
-       var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
+       attrs = new Array("dn");
+       var basedn = "";
+       var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
        var i;
-       if (typeof(res) == "undefined") {
-               ldb_delete(ldb);
+       if (res.error != 0) {
+               ldb_delete(info, ldb);
                return;
        }
-       for (i=0;i<res.length;i++) {
-               ldb.del(res[i].dn);
+       for (i=0;i<res.msgs.length;i++) {
+               ldb.del(res.msgs[i].dn);
        }
-       /* extra hack to ensure it's gone on remote ldap */
-       ldb.del("cn=ROOTDSE");
 
-       var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
-       if (res.length != 0) {
-               ldb_delete(ldb);
+       var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
+       if (res.error != 0 || res.msgs.length != 0) {
+               ldb_delete(info, ldb);
                return;
        }
-       assert(res.length == 0);
+       assert(res.msgs.length == 0);
 }
 
 /*
-  setup a ldb in the private dir
- */
-function setup_ldb(ldif, info, dbname)
+  erase an ldb, removing all records
+*/
+function ldb_erase_partitions(info, ldb, ldapbackend)
 {
-       var erase = true;
-       var extra = "";
-       var ldb = ldb_init();
+       var rootDSE_attrs = new Array("namingContexts");
        var lp = loadparm_init();
+       var j;
+
+       var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
+       assert(res.error == 0);
+       assert(res.msgs.length == 1);
+       if (typeof(res.msgs[0].namingContexts) == "undefined") {
+               return;
+       }       
+       for (j=0; j<res.msgs[0].namingContexts.length; j++) {
+               var anything = "(|(objectclass=*)(dn=*))";
+               var attrs = new Array("dn");
+               var basedn = res.msgs[0].namingContexts[j];
+               var k;
+               var previous_remaining = 1;
+               var current_remaining = 0;
+
+               if (ldapbackend && (basedn == info.subobj.DOMAINDN)) {
+                       /* Only delete objects that were created by provision */
+                       anything = "(objectcategory=*)";
+               }
+
+               for (k=0; k < 10 && (previous_remaining != current_remaining); k++) {
+                       /* and the rest */
+                       var res2 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
+                       var i;
+                       if (res2.error != 0) {
+                               info.message("ldb search failed: " + res.errstr + "\n");
+                               continue;
+                       }
+                       previous_remaining = current_remaining;
+                       current_remaining = res2.msgs.length;
+                       for (i=0;i<res2.msgs.length;i++) {
+                               ldb.del(res2.msgs[i].dn);
+                       }
+                       
+                       var res3 = ldb.search(anything, basedn, ldb.SCOPE_SUBTREE, attrs);
+                       if (res3.error != 0) {
+                               info.message("ldb search failed: " + res.errstr + "\n");
+                               continue;
+                       }
+                       if (res3.msgs.length != 0) {
+                               info.message("Failed to delete all records under " + basedn + ", " + res3.msgs.length + " records remaining\n");
+                       }
+               }
+       }
+}
+
+function open_ldb(info, dbname, erase)
+{
+       var ldb = ldb_init();
        ldb.session_info = info.session_info;
        ldb.credentials = info.credentials;
+       ldb.filename = dbname;
 
-       if (arguments.length >= 4) {
-               extra = arguments[3];
+       var connect_ok = ldb.connect(dbname);
+       if (!connect_ok) {
+               var lp = loadparm_init();
+               sys.unlink(sprintf("%s/%s", lp.get("private dir"), dbname));
+               connect_ok = ldb.connect(dbname);
+               assert(connect_ok);
        }
 
-       if (arguments.length == 5) {
-               erase = arguments[4];
-        }
+       ldb.transaction_start();
+
+       if (erase) {
+               ldb_erase(info, ldb);   
+       }
+       return ldb;
+}
+
 
+/*
+  setup a ldb in the private dir
+ */
+function setup_add_ldif(ldif, info, ldb, failok)
+{
+       var lp = loadparm_init();
        var src = lp.get("setup directory") + "/" + ldif;
 
        var data = sys.file_load(src);
-       data = data + extra;
        data = substitute_var(data, info.subobj);
 
-       ldb.filename = dbname;
+       var add_res = ldb.add(data);
+       if (add_res.error != 0) {
+               info.message("ldb load failed: " + add_res.errstr + "\n");
+               if (!failok) {
+                       assert(add_res.error == 0);
+               }
+       }
+       return (add_res.error == 0);
+}
 
-       var connect_ok = ldb.connect(dbname);
-       assert(connect_ok);
+function setup_modify_ldif(ldif, info, ldb, failok)
+{
+       var lp = loadparm_init();
+       var src = lp.get("setup directory") + "/" + ldif;
 
-       ldb.transaction_start();
+       var data = sys.file_load(src);
+       data = substitute_var(data, info.subobj);
 
-       if (erase) {
-               ldb_erase(ldb); 
+       var mod_res = ldb.modify(data);
+       if (mod_res.error != 0) {
+               info.message("ldb load failed: " + mod_res.errstr + "\n");
+               if (!failok) {
+                       assert(mod_res.error == 0);
+               }
        }
+       return (mod_res.error == 0);
+}
 
-       var add_ok = ldb.add(data);
-       if (!add_ok) {
-               info.message("ldb load failed: " + ldb.errstring() + "\n");
-               assert(add_ok);
+
+function setup_ldb(ldif, info, dbname) 
+{
+       var erase = true;
+       var failok = false;
+
+       if (arguments.length >= 4) {
+               erase = arguments[3];
+        }
+       if (arguments.length == 5) {
+               failok = arguments[4];
+        }
+       var ldb = open_ldb(info, dbname, erase);
+       if (setup_add_ldif(ldif, info, ldb, failok)) {
+               var commit_ok = ldb.transaction_commit();
+               if (!commit_ok) {
+                       info.message("ldb commit failed: " + ldb.errstring() + "\n");
+                       assert(commit_ok);
+               }
        }
-       var commit_ok = ldb.transaction_commit();
-       if (!commit_ok) {
-               info.message("ldb commit failed: " + ldb.errstring() + "\n");
-               assert(add_ok);
+}
+
+/*
+  setup a ldb in the private dir
+ */
+function setup_ldb_modify(ldif, info, ldb)
+{
+       var lp = loadparm_init();
+
+       var src = lp.get("setup directory") + "/" + ldif;
+
+       var data = sys.file_load(src);
+       data = substitute_var(data, info.subobj);
+
+       var mod_res = ldb.modify(data);
+       if (mod_res.error != 0) {
+               info.message("ldb load failed: " + mod_res.errstr + "\n");
+               return (mod_res.error == 0);
        }
+       return (mod_res.error == 0);
 }
 
 /*
   setup a file in the private dir
  */
-function setup_file(template, fname, subobj)
+function setup_file(template, message, fname, subobj)
 {
        var lp = loadparm_init();
        var f = fname;
@@ -263,24 +362,45 @@ function setup_file(template, fname, subobj)
        data = substitute_var(data, subobj);
 
        ok = sys.file_save(f, data);
-       assert(ok);
+       if (!ok) {
+               message("failed to create file: " + f + "\n");
+               assert(ok);
+       }
 }
 
 function provision_default_paths(subobj)
 {
+       /* subobj.DNSDOMAIN isn't available at this point */
+       var dnsdomain = strlower(subobj.REALM);
        var lp = loadparm_init();
        var paths = new Object();
        paths.smbconf = lp.get("config file");
-       paths.hklm = "hklm.ldb";
-       paths.hkcu = "hkcu.ldb";
-       paths.hkcr = "hkcr.ldb";
-       paths.hku = "hku.ldb";
-       paths.hkpd = "hkpd.ldb";
-       paths.hkpt = "hkpt.ldb";
+       paths.shareconf = lp.get("private dir") + "/" + "share.ldb";
        paths.samdb = lp.get("sam database");
-       paths.secrets = "secrets.ldb";
-       paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
+       paths.secrets = lp.get("secrets database");
+       paths.keytab = "secrets.keytab";
+       paths.dns_keytab = "dns.keytab";
+       paths.dns_keytab_abs = lp.get("private dir") + "/" + paths.dns_keytab;
+       paths.dns = lp.get("private dir") + "/" + dnsdomain + ".zone";
+       paths.named_conf = lp.get("private dir") + "/named.conf";
        paths.winsdb = "wins.ldb";
+       paths.ldapdir = lp.get("private dir") + "/ldap";
+       paths.ldap_basedn_ldif = paths.ldapdir + "/" + dnsdomain + ".ldif";
+       paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-config.ldif";
+       paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + dnsdomain + "-schema.ldif";
+
+       paths.sysvol = lp.get("sysvol", "path");
+
+       if (paths.sysvol == undefined) {
+               paths.sysvol = lp.get("lock dir") + "/sysvol";
+       }
+       
+       paths.netlogon = lp.get("netlogon", "path");
+       
+       if (paths.netlogon == undefined) {
+               paths.netlogon = paths.sysvol + "/" + dnsdomain + "/scripts";
+       }
+
        return paths;
 }
 
@@ -288,16 +408,23 @@ function provision_default_paths(subobj)
 /*
   setup reasonable name mappings for sam names to unix names
 */
-function setup_name_mappings(info, subobj, session_info, credentials)
+function setup_name_mappings(info, ldb)
 {
        var lp = loadparm_init();
-       var ldb = ldb_init();
-       ldb.session_info = session_info;
-       ldb.credentials = credentials;
-       var ok = ldb.connect(lp.get("sam database"));
-       if (!ok) {
-               return false;
-       }
+       var attrs = new Array("objectSid");
+       var subobj = info.subobj;
+
+       res = ldb.search("objectSid=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
+       assert(res.error == 0);
+       assert(res.msgs.length == 1 && res.msgs[0].objectSid != undefined);
+       var sid = res.msgs[0].objectSid;
+
+       /* add some foreign sids if they are not present already */
+       add_foreign(ldb, subobj, "S-1-5-7",  "Anonymous");
+       add_foreign(ldb, subobj, "S-1-1-0",  "World");
+       add_foreign(ldb, subobj, "S-1-5-2",  "Network");
+       add_foreign(ldb, subobj, "S-1-5-18", "System");
+       add_foreign(ldb, subobj, "S-1-5-11", "Authenticated Users");
 
        /* some well known sids */
        setup_name_mapping(info, ldb, "S-1-5-7",  subobj.NOBODY);
@@ -306,49 +433,136 @@ function setup_name_mappings(info, subobj, session_info, credentials)
        setup_name_mapping(info, ldb, "S-1-5-18", subobj.ROOT);
        setup_name_mapping(info, ldb, "S-1-5-11", subobj.USERS);
        setup_name_mapping(info, ldb, "S-1-5-32-544", subobj.WHEEL);
+       setup_name_mapping(info, ldb, "S-1-5-32-545", subobj.USERS);
        setup_name_mapping(info, ldb, "S-1-5-32-546", subobj.NOGROUP);
+       setup_name_mapping(info, ldb, "S-1-5-32-551", subobj.BACKUP);
 
        /* and some well known domain rids */
-       setup_name_mapping(info, ldb, subobj.DOMAINSID + "-500", subobj.ROOT);
-       setup_name_mapping(info, ldb, subobj.DOMAINSID + "-518", subobj.WHEEL);
-       setup_name_mapping(info, ldb, subobj.DOMAINSID + "-519", subobj.WHEEL);
-       setup_name_mapping(info, ldb, subobj.DOMAINSID + "-512", subobj.WHEEL);
-       setup_name_mapping(info, ldb, subobj.DOMAINSID + "-513", subobj.USERS);
-       setup_name_mapping(info, ldb, subobj.DOMAINSID + "-520", subobj.WHEEL);
+       setup_name_mapping(info, ldb, sid + "-500", subobj.ROOT);
+       setup_name_mapping(info, ldb, sid + "-518", subobj.WHEEL);
+       setup_name_mapping(info, ldb, sid + "-519", subobj.WHEEL);
+       setup_name_mapping(info, ldb, sid + "-512", subobj.WHEEL);
+       setup_name_mapping(info, ldb, sid + "-513", subobj.USERS);
+       setup_name_mapping(info, ldb, sid + "-520", subobj.WHEEL);
+
+       return true;
+}
+
+function provision_fix_subobj(subobj, paths)
+{
+       var ldb = ldb_init();
+       
+       subobj.REALM       = strupper(subobj.REALM);
+       subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
+       subobj.DOMAIN      = strupper(subobj.DOMAIN);
+       assert(valid_netbios_name(subobj.DOMAIN));
+       subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
+       assert(valid_netbios_name(subobj.NETBIOSNAME));
+       subobj.DNSDOMAIN    = strlower(subobj.REALM);
+       subobj.DNSNAME      = sprintf("%s.%s", 
+                                     strlower(subobj.HOSTNAME), 
+                                     subobj.DNSDOMAIN);
+       var rdn_list = split(".", subobj.DNSDOMAIN);
+       subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
+       subobj.ROOTDN       = subobj.DOMAINDN;
+       subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
+       subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
+
+       subobj.MACHINEPASS_B64 = ldb.encode(subobj.MACHINEPASS);
+       subobj.KRBTGTPASS_B64  = ldb.encode(subobj.KRBTGTPASS);
+       subobj.ADMINPASS_B64   = ldb.encode(subobj.ADMINPASS);
+       subobj.DNSPASS_B64     = ldb.encode(subobj.DNSPASS);
+
+       var rdns = split(",", subobj.DOMAINDN);
+       subobj.RDN_DC = substr(rdns[0], strlen("DC="));
+
+       subobj.SAM_LDB          = "tdb://" + paths.samdb;
+       subobj.SECRETS_KEYTAB   = paths.keytab;
+       subobj.DNS_KEYTAB       = paths.dns_keytab;
+       subobj.DNS_KEYTAB_ABS   = paths.dns_keytab_abs;
+
+       subobj.LDAPDIR = paths.ldapdir;
+       var ldap_path_list = split("/", paths.ldapdir);
+       subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
+
+       subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
+
+       subobj.NETLOGONPATH = paths.netlogon;
+       subobj.SYSVOLPATH = paths.sysvol;
 
        return true;
 }
 
+function provision_become_dc(subobj, message, erase, paths, session_info)
+{
+       var lp = loadparm_init();
+       var sys = sys_init();
+       var info = new Object();
+
+       var ok = provision_fix_subobj(subobj, paths);
+       assert(ok);
+
+       info.subobj = subobj;
+       info.message = message;
+       info.session_info = session_info;
+
+       /* Also wipes the database */
+       message("Setting up " + paths.samdb + " partitions\n");
+       setup_ldb("provision_partitions.ldif", info, paths.samdb);
+
+       var samdb = open_ldb(info, paths.samdb, false);
+
+       message("Setting up " + paths.samdb + " attributes\n");
+       setup_add_ldif("provision_init.ldif", info, samdb, false);
+
+       message("Setting up " + paths.samdb + " rootDSE\n");
+       setup_add_ldif("provision_rootdse_add.ldif", info, samdb, false);
+
+       if (erase) {
+               message("Erasing data from partitions\n");
+               ldb_erase_partitions(info, samdb, undefined);
+       }
+
+       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);
+
+       message("Setting up " + paths.secrets + "\n");
+       setup_ldb("secrets_init.ldif", info, paths.secrets);
+
+       setup_ldb("secrets.ldif", info, paths.secrets, false);
+
+       return true;
+}
 
 /*
   provision samba4 - caution, this wipes all existing data!
 */
-function provision(subobj, message, blank, paths, session_info, credentials)
+function provision(subobj, message, blank, paths, session_info, credentials, ldapbackend)
 {
-       var data = "";
        var lp = loadparm_init();
        var sys = sys_init();
        var info = new Object();
 
-       /*
-         some options need to be upper/lower case
-       */
-       subobj.REALM       = strupper(subobj.REALM);
-       subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
-       subobj.DOMAIN      = strupper(subobj.DOMAIN);
-       assert(valid_netbios_name(subobj.DOMAIN));
-       subobj.NETBIOSNAME = strupper(subobj.HOSTNAME);
-       assert(valid_netbios_name(subobj.NETBIOSNAME));
-       var rdns = split(",", subobj.BASEDN);
-       subobj.RDN_DC = substr(rdns[0], strlen("DC="));
+       var ok = provision_fix_subobj(subobj, paths);
+       assert(ok);
 
-       data = add_foreign(data, "S-1-5-7",  "Anonymous",           "${NOBODY}");
-       data = add_foreign(data, "S-1-1-0",  "World",               "${NOGROUP}");
-       data = add_foreign(data, "S-1-5-2",  "Network",             "${NOGROUP}");
-       data = add_foreign(data, "S-1-5-18", "System",              "${ROOT}");
-       data = add_foreign(data, "S-1-5-11", "Authenticated Users", "${USERS}");
+       if (subobj.DOMAINGUID != undefined) {
+               subobj.DOMAINGUID_MOD = sprintf("replace: objectGUID\nobjectGUID: %s\n-", subobj.DOMAINGUID);
+       } else {
+               subobj.DOMAINGUID_MOD = "";
+       }
 
-       provision_next_usn = 1;
+       if (subobj.HOSTGUID != undefined) {
+               subobj.HOSTGUID_ADD = sprintf("objectGUID: %s", subobj.HOSTGUID);
+       } else {
+               subobj.HOSTGUID_ADD = "";
+       }
 
        info.subobj = subobj;
        info.message = message;
@@ -358,46 +572,248 @@ function provision(subobj, message, blank, paths, session_info, credentials)
        /* only install a new smb.conf if there isn't one there already */
        var st = sys.stat(paths.smbconf);
        if (st == undefined) {
-               message("Setting up smb.conf\n");
-               setup_file("provision.smb.conf", paths.smbconf, subobj);
+               message("Setting up " + paths.smbconf +"\n");
+               setup_file("provision.smb.conf", info.message, paths.smbconf, subobj);
                lp.reload();
        }
-       message("Setting up secrets.ldb\n");
-       setup_ldb("secrets.ldif", info, paths.secrets);
-       message("Setting up keytabs\n");
-       var keytab_ok = credentials_update_all_keytabs();
-       assert(keytab_ok);
-       message("Setting up hklm.ldb\n");
-       setup_ldb("hklm.ldif", info, paths.hklm);
+       /* only install a new shares config db if there is none */
+       st = sys.stat(paths.shareconf);
+       if (st == undefined) {
+               message("Setting up share.ldb\n");
+               setup_ldb("share.ldif", info, paths.shareconf);
+       }
 
+       message("Setting up " + paths.secrets + "\n");
+       setup_ldb("secrets_init.ldif", info, paths.secrets);
+       setup_ldb("secrets.ldif", info, paths.secrets, false);
+
+       message("Setting up the registry\n");
+       var reg = reg_open();
+       reg.apply_patchfile(lp.get("setup directory") + "/provision.reg")
+
+       message("Setting up sam.ldb partitions\n");
+       /* Also wipes the database */
+       setup_ldb("provision_partitions.ldif", info, paths.samdb);
+
+       var samdb = open_ldb(info, paths.samdb, false);
 
        message("Setting up sam.ldb attributes\n");
-       setup_ldb("provision_init.ldif", info, paths.samdb);
-       message("Setting up sam.ldb schema\n");
-       setup_ldb("schema.ldif", info, paths.samdb, NULL, false);
+       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);
+       
+       message("Adding DomainDN: " + subobj.DOMAINDN + " (permitted to fail)\n");
+       var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
+       message("Modifying DomainDN: " + subobj.DOMAINDN + "\n");
+       var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
+       if (!modify_ok) {
+               if (!add_ok) {
+                       message("%s", "Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + ": " + samdb.errstring() + "\n");
+                       message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
+               };
+               assert(modify_ok);
+       };
+
+       message("Adding configuration container (permitted to fail)\n");
+       var add_ok = setup_add_ldif("provision_configuration_basedn.ldif", info, samdb, true);
+       message("Modifying configuration container\n");
+       var modify_ok = setup_ldb_modify("provision_configuration_basedn_modify.ldif", info, samdb);
+       if (!modify_ok) {
+               if (!add_ok) {
+                       message("%s", "Failed to both add and modify " + subobj.CONFIGDN + " in target " + subobj.CONFIGDN_LDB + ": " + samdb.errstring() + "\n");
+                       message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
+                       assert(modify_ok);
+               }
+               assert(modify_ok);
+       }
+
+       message("Adding schema container (permitted to fail)\n");
+       var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
+       message("Modifying schema container\n");
+       var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
+       if (!modify_ok) {
+               if (!add_ok) {
+                       message("%s", "Failed to both add and modify " + subobj.SCHEMADN + " in target " + subobj.SCHEMADN_LDB + ": " + samdb.errstring() + "\n");
+                       message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
+                       assert(modify_ok);
+               }
+               message("Failed to modify the schema container: " + samdb.errstring() + "\n");
+               assert(modify_ok);
+       }
+
+       message("Setting up sam.ldb Samba4 schema\n");
+       setup_add_ldif("schema_samba4.ldif", info, samdb, false);
+       message("Setting up sam.ldb AD schema\n");
+       setup_add_ldif("schema.ldif", info, samdb, false);
+
+       // (hack) Reload, now we have the schema loaded.  
+       var commit_ok = samdb.transaction_commit();
+       if (!commit_ok) {
+               info.message("samdb commit failed: " + samdb.errstring() + "\n");
+               assert(commit_ok);
+       }
+       samdb.close();
+
+       samdb = open_ldb(info, paths.samdb, false);
+
+       message("Setting up sam.ldb configuration data\n");
+       setup_add_ldif("provision_configuration.ldif", info, samdb, false);
+
        message("Setting up display specifiers\n");
-       setup_ldb("display_specifiers.ldif", info, paths.samdb, NULL, false);
+       setup_add_ldif("display_specifiers.ldif", info, samdb, false);
        message("Setting up sam.ldb templates\n");
-       setup_ldb("provision_templates.ldif", info, paths.samdb, NULL, false);
+       setup_add_ldif("provision_templates.ldif", info, samdb, false);
+
+       message("Adding users container (permitted to fail)\n");
+       var add_ok = setup_add_ldif("provision_users_add.ldif", info, samdb, true);
+       message("Modifying users container\n");
+       var modify_ok = setup_ldb_modify("provision_users_modify.ldif", info, samdb);
+       if (!modify_ok) {
+               if (!add_ok) {
+                       message("Failed to both add and modify the users container\n");
+                       assert(modify_ok);
+               }
+               assert(modify_ok);
+       }
+       message("Adding computers container (permitted to fail)\n");
+       var add_ok = setup_add_ldif("provision_computers_add.ldif", info, samdb, true);
+       message("Modifying computers container\n");
+       var modify_ok = setup_ldb_modify("provision_computers_modify.ldif", info, samdb);
+       if (!modify_ok) {
+               if (!add_ok) {
+                       message("Failed to both add and modify the computers container\n");
+                       assert(modify_ok);
+               }
+               assert(modify_ok);
+       }
+
        message("Setting up sam.ldb data\n");
-       setup_ldb("provision.ldif", info, paths.samdb, NULL, false);
+       setup_add_ldif("provision.ldif", info, samdb, false);
+
        if (blank != false) {
+               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");
+                       assert(commit_ok);
+               }
                return true;
        }
 
+//     message("Activate schema module");
+//     setup_modify_ldif("schema_activation.ldif", info, samdb, false);
+//
+//     // (hack) Reload, now we have the schema loaded.  
+//     var commit_ok = samdb.transaction_commit();
+//     if (!commit_ok) {
+//             info.message("samdb commit failed: " + samdb.errstring() + "\n");
+//             assert(commit_ok);
+//     }
+//     samdb.close();
+//
+//     samdb = open_ldb(info, paths.samdb, false);
+//
        message("Setting up sam.ldb users and groups\n");
-       setup_ldb("provision_users.ldif", info, paths.samdb, data, false);
+       setup_add_ldif("provision_users.ldif", info, samdb, false);
+
+       if (lp.get("server role") == "domain controller") {
+               message("Setting up self join\n");
+               setup_add_ldif("provision_self_join.ldif", info, samdb, false);
+               setup_add_ldif("provision_group_policy.ldif", info, samdb, false);
+
+               sys.mkdir(paths.sysvol, 0755);
+               sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN, 0755);
+               sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies", 0755);
+               sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}", 0755);
+               sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}/Machine", 0755);
+               sys.mkdir(paths.sysvol + "/"+ subobj.DNSDOMAIN + "/Policies/{" + subobj.POLICYGUID + "}/User", 0755);
 
-       if (setup_name_mappings(info, subobj, session_info, credentials) == false) {
+               sys.mkdir(paths.netlogon, 0755);
+       }
+
+       if (setup_name_mappings(info, samdb) == false) {
                return false;
        }
 
+       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");
+               assert(commit_ok);
+       }
+
        return true;
 }
 
+/*
+  provision just the schema into a temporary ldb, so we can run ad2oLschema on it
+*/
+function provision_schema(subobj, message, tmp_schema_path, paths)
+{
+       var lp = loadparm_init();
+       var sys = sys_init();
+       var info = new Object();
+
+       var ok = provision_fix_subobj(subobj, paths);
+       assert(ok);
+
+       info.subobj = subobj;
+       info.message = message;
+
+       message("Setting up sam.ldb partitions\n");
+
+       /* This will erase anything in the tmp db */
+       var samdb = open_ldb(info, tmp_schema_path, true);
+
+       message("Adding schema container (permitted to fail)\n");
+       var add_ok = setup_add_ldif("provision_schema_basedn.ldif", info, samdb, true);
+       message("Modifying schema container\n");
+       var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb);
+       if (!modify_ok) {
+               if (!add_ok) {
+                       message("Failed to both add and modify schema dn: " + samdb.errstring() + "\n");
+                       message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
+                       assert(modify_ok);
+               }
+               message("Failed to modify the schema container: " + samdb.errstring() + "\n");
+               assert(modify_ok);
+       }
+
+       message("Setting up sam.ldb Samba4 schema\n");
+       setup_add_ldif("schema_samba4.ldif", info, samdb, false);
+       message("Setting up sam.ldb AD schema\n");
+       setup_add_ldif("schema.ldif", info, samdb, false);
+
+       var commit_ok = samdb.transaction_commit();
+       if (!commit_ok) {
+               info.message("samdb commit failed: " + samdb.errstring() + "\n");
+               assert(commit_ok);
+       }
+       samdb.close();
+}
+
 /* Write out a DNS zone file, from the info in the current database */
 function provision_dns(subobj, message, paths, session_info, credentials)
 {
+       var lp = loadparm_init();
+       if (lp.get("server role") != "domain controller") {
+               message("No DNS zone required for role %s\n", lp.get("server role"));
+               return;
+       }
        message("Setting up DNS zone: " + subobj.DNSDOMAIN + " \n");
        var ldb = ldb_init();
        ldb.session_info = session_info;
@@ -407,20 +823,59 @@ function provision_dns(subobj, message, paths, session_info, credentials)
        var ok = ldb.connect(paths.samdb);
        assert(ok);
 
-       /* These values may have changed, due to an incoming SamSync, so fetch them from the database */
-       subobj.DOMAINGUID = searchone(ldb, "(&(objectClass=domainDNS)(dnsDomain=" + subobj.DNSDOMAIN + "))", "objectGUID");
-       assert(subobj.DOMAINGUID != undefined);
+       /* These values may have changed, due to an incoming SamSync,
+           or may not have been specified, so fetch them from the database */
 
-       subobj.HOSTGUID = searchone(ldb, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
+       var attrs = new Array("objectGUID");
+       res = ldb.search("objectGUID=*", subobj.DOMAINDN, ldb.SCOPE_BASE, attrs);
+       assert(res.error == 0);
+       assert(res.msgs.length == 1);
+       assert(res.msgs[0].objectGUID != undefined);
+       subobj.DOMAINGUID = res.msgs[0].objectGUID;
+
+       subobj.HOSTGUID = searchone(ldb, subobj.DOMAINDN, "(&(objectClass=computer)(cn=" + subobj.NETBIOSNAME + "))", "objectGUID");
        assert(subobj.HOSTGUID != undefined);
 
        setup_file("provision.zone", 
-                  paths.dns, 
+                  message, paths.dns, 
+                  subobj);
+
+       setup_file("named.conf", 
+                  message, paths.named_conf, 
                   subobj);
 
-       message("Please install the zone located in " + paths.dns + " into your DNS server\n");
+       message("Please install the zone located in " + paths.dns + " into your DNS server.  A sample BIND configuration snippit is at " + paths.named_conf + "\n");
 }
 
+/* Write out a DNS zone file, from the info in the current database */
+function provision_ldapbase(subobj, message, paths)
+{
+       var ok = provision_fix_subobj(subobj, paths);
+       assert(ok);
+
+       message("Setting up LDAP base entry: " + subobj.DOMAINDN + " \n");
+       var rdns = split(",", subobj.DOMAINDN);
+       subobj.EXTENSIBLEOBJECT = "objectClass: extensibleObject";
+
+       subobj.RDN_DC = substr(rdns[0], strlen("DC="));
+
+       sys.mkdir(paths.ldapdir, 0700);
+
+       setup_file("provision_basedn.ldif", 
+                  message, paths.ldap_basedn_ldif, 
+                  subobj);
+
+       setup_file("provision_configuration_basedn.ldif", 
+                  message, paths.ldap_config_basedn_ldif, 
+                  subobj);
+
+       setup_file("provision_schema_basedn.ldif", 
+                  message, paths.ldap_schema_basedn_ldif, 
+                  subobj);
+
+}
+
+
 /*
   guess reasonably default options for provisioning
 */
@@ -439,47 +894,80 @@ function provision_guess()
        assert(subobj.REALM);
        assert(subobj.DOMAIN);
        assert(subobj.HOSTNAME);
-
+       
+       subobj.VERSION      = version();
        subobj.HOSTIP       = hostip();
-       subobj.DOMAINGUID   = randguid();
        subobj.DOMAINSID    = randsid();
-       subobj.HOSTGUID     = randguid();
        subobj.INVOCATIONID = randguid();
+       subobj.POLICYGUID   = randguid();
        subobj.KRBTGTPASS   = randpass(12);
        subobj.MACHINEPASS  = randpass(12);
+       subobj.DNSPASS  = randpass(12);
        subobj.ADMINPASS    = randpass(12);
+       subobj.LDAPMANAGERPASS     = randpass(12);
        subobj.DEFAULTSITE  = "Default-First-Site-Name";
        subobj.NEWGUID      = randguid;
        subobj.NTTIME       = nttime;
        subobj.LDAPTIME     = ldaptime;
        subobj.DATESTRING   = datestring;
-       subobj.USN          = nextusn;
        subobj.ROOT         = findnss(nss.getpwnam, "root");
        subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
        subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
-       subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff");
-       subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
-       subobj.DNSDOMAIN    = strlower(subobj.REALM);
-       subobj.DNSNAME      = sprintf("%s.%s", 
-                                     strlower(subobj.HOSTNAME), 
-                                     subobj.DNSDOMAIN);
-       rdn_list = split(".", subobj.DNSDOMAIN);
-       subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
+       subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff", "adm");
+       subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
+       subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown", "usr");
+
+       //Add modules to the list to activate them by default
+       //beware often order is important
+       //
+       // Some Known ordering constraints:
+       // - rootdse must be first, as it makes redirects from "" -> cn=rootdse
+       // - samldb must be before password_hash, because password_hash checks
+       //   that the objectclass is of type person (filled in by samldb)
+       // - partition must be last
+       // - each partition has its own module list then
+       modules_list        = new Array("rootdse",
+                                       "kludge_acl",
+                                       "paged_results",
+                                       "server_sort",
+                                       "extended_dn",
+                                       "asq",
+                                       "samldb",
+                                       "operational",
+                                       "objectclass",
+                                       "rdn_name",
+                                       "show_deleted",
+                                       "partition");
+       subobj.MODULES_LIST = join(",", modules_list);
+       subobj.DOMAINDN_LDB = "users.ldb";
+       subobj.CONFIGDN_LDB = "configuration.ldb";
+       subobj.SCHEMADN_LDB = "schema.ldb";
+       subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash";
+       subobj.CONFIGDN_MOD = "naming_fsmo";
+       subobj.SCHEMADN_MOD = "schema_fsmo";
+       subobj.DOMAINDN_MOD2 = ",objectguid";
+       subobj.CONFIGDN_MOD2 = ",objectguid";
+       subobj.SCHEMADN_MOD2 = ",objectguid";
+
+       subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
+       subobj.ACI              = "# no aci for local ldb";
+
        return subobj;
 }
 
 /*
   search for one attribute as a string
  */
-function searchone(ldb, expression, attribute)
+function searchone(ldb, basedn, expression, attribute)
 {
        var attrs = new Array(attribute);
-       res = ldb.search(expression, attrs);
-       if (res.length != 1 ||
-           res[0][attribute] == undefined) {
+       res = ldb.search(expression, basedn, ldb.SCOPE_SUBTREE, attrs);
+       if (res.error != 0 ||
+           res.msgs.length != 1 ||
+           res.msgs[0][attribute] == undefined) {
                return undefined;
        }
-       return res[0][attribute];
+       return res.msgs[0][attribute];
 }
 
 /*
@@ -489,8 +977,9 @@ function enable_account(ldb, user_dn)
 {
        var attrs = new Array("userAccountControl");
        var res = ldb.search(NULL, user_dn, ldb.SCOPE_ONELEVEL, attrs);
-       assert(res.length == 1);
-       var userAccountControl = res[0].userAccountControl;
+       assert(res.error == 0);
+       assert(res.msgs.length == 1);
+       var userAccountControl = res.msgs[0].userAccountControl;
        userAccountControl = userAccountControl - 2; /* remove disabled bit */
        var mod = sprintf("
 dn: %s
@@ -500,7 +989,7 @@ userAccountControl: %u
 ", 
                          user_dn, userAccountControl);
        var ok = ldb.modify(mod);
-       return ok;      
+       return (ok.error == 0); 
 }
 
 
@@ -523,9 +1012,13 @@ function newuser(username, unixname, password, message, session_info, credential
        ldb.transaction_start();
 
        /* find the DNs for the domain and the domain users group */
-       var domain_dn = searchone(ldb, "objectClass=domainDNS", "dn");
+       var attrs = new Array("defaultNamingContext");
+       res = ldb.search("defaultNamingContext=*", "", ldb.SCOPE_BASE, attrs);
+       assert(res.error == 0);
+       assert(res.msgs.length == 1 && res.msgs[0].defaultNamingContext != undefined);
+       var domain_dn = res.msgs[0].defaultNamingContext;
        assert(domain_dn != undefined);
-       var dom_users = searchone(ldb, "name=Domain Users", "dn");
+       var dom_users = searchone(ldb, domain_dn, "name=Domain Users", "dn");
        assert(dom_users != undefined);
 
        var user_dn = sprintf("CN=%s,CN=Users,%s", username, domain_dn);
@@ -562,15 +1055,15 @@ member: %s
        */
        message("Adding user %s\n", user_dn);
        ok = ldb.add(ldif);
-       if (ok != true) {
-               message("Failed to add %s - %s\n", user_dn, ldb.errstring());
+       if (ok.error != 0) {
+               message("Failed to add %s - %s\n", user_dn, ok.errstr);
                return false;
        }
 
        message("Modifying group %s\n", dom_users);
        ok = ldb.modify(modgroup);
-       if (ok != true) {
-               message("Failed to modify %s - %s\n", dom_users, ldb.errstring());
+       if (ok.error != 0) {
+               message("Failed to modify %s - %s\n", dom_users, ok.errstr);
                return false;
        }
 
@@ -608,13 +1101,13 @@ function provision_validate(subobj, message)
        }
 
 
-       if (lp.get("workgroup") != subobj.DOMAIN) {
+       if (strupper(lp.get("workgroup")) != strupper(subobj.DOMAIN)) {
                message("workgroup '%s' in smb.conf must match chosen domain '%s'\n",
                        lp.get("workgroup"), subobj.DOMAIN);
                return false;
        }
 
-       if (lp.get("realm") != subobj.REALM) {
+       if (strupper(lp.get("realm")) != strupper(subobj.REALM)) {
                message("realm '%s' in smb.conf must match chosen realm '%s'\n",
                        lp.get("realm"), subobj.REALM);
                return false;
@@ -656,6 +1149,7 @@ function vampire(domain, session_info, credentials, message) {
                message("Migration of remote domain to Samba failed: " + vampire_ctx.error_string);
                return false;
        }
+
        return true;
 }