sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

r17704: Add comments suggesting how to get the LDAP backend working.

Browse Source 
Shutdown and reload the LDB, so the entryUUID module knows to read the
schema (will be changed once we have a central schema store and
notifications).

Andrew Bartlett
(This used to be commit d5814b689e)
This commit is contained in:
Andrew Bartlett
2006-08-22 10:19:46 +00:00
committed by Gerald (Jerry) Carter
parent 6ddd5f6e66
commit 4c69b46944
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source4/scripting/libjs/provision.js
View File

@ -236,6 +236,7 @@ function open_ldb(info, dbname, erase)
var connect_ok = ldb.connect(dbname); var connect_ok = ldb.connect(dbname);
if (!connect_ok) { if (!connect_ok) {
var lp = loadparm_init();
sys.unlink(sprintf("%s/%s", lp.get("private dir"), dbname)); sys.unlink(sprintf("%s/%s", lp.get("private dir"), dbname));
connect_ok = ldb.connect(dbname); connect_ok = ldb.connect(dbname);
assert(connect_ok); assert(connect_ok);
@ -307,8 +308,9 @@ function setup_ldb_modify(ldif, info, ldb)
var mod_ok = ldb.modify(data); var mod_ok = ldb.modify(data);
if (!mod_ok) { if (!mod_ok) {
info.message("ldb load failed: " + ldb.errstring() + "\n"); info.message("ldb load failed: " + ldb.errstring() + "\n");
assert(mod_ok); return mod_ok;
} }
return mod_ok;
} }
/* /*
@ -453,14 +455,32 @@ function provision(subobj, message, blank, paths, session_info, credentials)
ldb_erase_partitions(info, samdb); ldb_erase_partitions(info, samdb);
message("Adding baseDN: " + subobj.BASEDN + " (permitted to fail)\n"); message("Adding baseDN: " + subobj.BASEDN + " (permitted to fail)\n");
setup_add_ldif("provision_basedn.ldif", info, samdb, true); var add_ok = setup_add_ldif("provision_basedn.ldif", info, samdb, true);
message("Modifying baseDN: " + subobj.BASEDN + "\n"); message("Modifying baseDN: " + subobj.BASEDN + "\n");
setup_ldb_modify("provision_basedn_modify.ldif", info, samdb); var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
if (!modify_ok) {
if (!add_ok) {
message("Failed to both add and modify " + subobj.BASEDN + " in target " + subobj.LDAPBACKEND + "\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("Setting up sam.ldb Samba4 schema\n"); message("Setting up sam.ldb Samba4 schema\n");
setup_add_ldif("schema_samba4.ldif", info, samdb, false); setup_add_ldif("schema_samba4.ldif", info, samdb, false);
message("Setting up sam.ldb AD schema\n"); message("Setting up sam.ldb AD schema\n");
setup_add_ldif("schema.ldif", info, samdb, false); 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 display specifiers\n"); message("Setting up display specifiers\n");
setup_add_ldif("display_specifiers.ldif", info, samdb, false); setup_add_ldif("display_specifiers.ldif", info, samdb, false);
message("Setting up sam.ldb templates\n"); message("Setting up sam.ldb templates\n");