Author: abartlet Date: 2007-07-04 11:06:32 +0000 (Wed, 04 Jul 2007) New Revision: 23703
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23703 Log: Start to get Samba4 to again work with LDAP backends, after I turned on metze's schema work. Andrew Bartlett Modified: branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c branches/SAMBA_4_0/source/scripting/libjs/provision.js branches/SAMBA_4_0/source/setup/provision branches/SAMBA_4_0/source/setup/provision-backend Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c 2007-07-04 07:45:41 UTC (rev 23702) +++ branches/SAMBA_4_0/source/lib/ldb/modules/paged_searches.c 2007-07-04 11:06:32 UTC (rev 23703) @@ -412,6 +412,7 @@ data = talloc(module, struct private_data); if (data == NULL) { + ldb_set_errstring(module->ldb, "Out of Memory"); return LDB_ERR_OTHER; } module->private_data = data; @@ -424,7 +425,7 @@ } req->operation = LDB_SEARCH; - req->op.search.base = ldb_dn_new(req, module->ldb, NULL); + req->op.search.base = ldb_dn_new(req, module->ldb, ""); req->op.search.scope = LDB_SCOPE_BASE; req->op.search.tree = ldb_parse_tree(req, "objectClass=*"); Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js =================================================================== --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-07-04 07:45:41 UTC (rev 23702) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-07-04 11:06:32 UTC (rev 23703) @@ -450,12 +450,9 @@ subobj.DNSDOMAIN); rdn_list = split(".", subobj.DNSDOMAIN); subobj.DOMAINDN = "DC=" + join(",DC=", rdn_list); - subobj.DOMAINDN_LDB = "users.ldb"; subobj.ROOTDN = subobj.DOMAINDN; subobj.CONFIGDN = "CN=Configuration," + subobj.ROOTDN; - subobj.CONFIGDN_LDB = "configuration.ldb"; subobj.SCHEMADN = "CN=Schema," + subobj.CONFIGDN; - subobj.SCHEMADN_LDB = "schema.ldb"; var rdns = split(",", subobj.DOMAINDN); subobj.RDN_DC = substr(rdns[0], strlen("DC=")); @@ -888,6 +885,9 @@ "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"; Modified: branches/SAMBA_4_0/source/setup/provision =================================================================== --- branches/SAMBA_4_0/source/setup/provision 2007-07-04 07:45:41 UTC (rev 23702) +++ branches/SAMBA_4_0/source/setup/provision 2007-07-04 11:06:32 UTC (rev 23703) @@ -129,14 +129,15 @@ if (ldapbackend) { if (!ldapmodule) { - subobj["LDAPMODULE"] = "entryUUID"; + subobj.LDAPMODULE = "entryUUID"; } - subobj["DOMAINDN_LDB"] = subobj["LDAPBACKEND"]; - subobj["DOMAINDN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; - subobj["CONFIGDN_LDB"] = subobj["LDAPBACKEND"]; - subobj["CONFIGDN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; - subobj["SCHEMADN_LDB"] = subobj["LDAPBACKEND"]; - subobj["SCHEMADN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; + subobj.DOMAINDN_LDB = subobj.LDAPBACKEND; + subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; + subobj.CONFIGDN_LDB = subobj.LDAPBACKEND; + subobj.CONFIGDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; + subobj.SCHEMADN_LDB = subobj.LDAPBACKEND; + subobj.SCHEMADN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; + message("LDAP module: %s backend: %s\n", subobj.LDAPMODULE, subobj.LDAPBACKEND); } if (!provision_validate(subobj, message)) { Modified: branches/SAMBA_4_0/source/setup/provision-backend =================================================================== --- branches/SAMBA_4_0/source/setup/provision-backend 2007-07-04 07:45:41 UTC (rev 23702) +++ branches/SAMBA_4_0/source/setup/provision-backend 2007-07-04 11:06:32 UTC (rev 23703) @@ -88,7 +88,7 @@ var paths = provision_default_paths(subobj); -provision_fix_subobj(subobj, message, paths); +provision_fix_subobj(subobj, paths); message("Provisioning LDAP backend for %s in realm %s into %s\n", subobj.HOSTNAME, subobj.REALM, subobj.LDAPDIR); message("Using LDAP Manager password: %s\n", subobj.LDAPMANAGERPASS); var tmp_schema_ldb = subobj.LDAPDIR + "/schema-tmp.ldb";
