summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-01 04:34:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:01 -0500
commitba1c80524ae34662b11b4c5acbaa90d831a5213a (patch)
treec20d88ff04bc3a3fdc58fc9cbb53e972b1b9eb10
parente424b054d1c9c4c6e1adb4ae7da8232766282c33 (diff)
downloadsamba-ba1c80524ae34662b11b4c5acbaa90d831a5213a.tar.gz
samba-ba1c80524ae34662b11b4c5acbaa90d831a5213a.tar.bz2
samba-ba1c80524ae34662b11b4c5acbaa90d831a5213a.zip
r17982: One final hack...
When against a real, schema-checking LDAP backend, we need extensibleObject on the baseDN entry (as entryUUID isn't run for creating this basic ldif) output. (This used to be commit befac43f59c4688f6c6827eb2e4e916c1056a740)
-rw-r--r--source4/scripting/libjs/provision.js3
-rw-r--r--source4/setup/provision_basedn.ldif1
2 files changed, 4 insertions, 0 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index d8abcc352f..cd09962931 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -565,6 +565,8 @@ function provision_ldapbase(subobj, message, paths)
{
message("Setting up LDAP base entry: " + subobj.BASEDN + " \n");
var rdns = split(",", subobj.BASEDN);
+ subobj.EXTENSIBLEOBJECT = "objectClass: extensibleObject";
+
subobj.RDN_DC = substr(rdns[0], strlen("DC="));
setup_file("provision_basedn.ldif",
@@ -619,6 +621,7 @@ function provision_guess()
rdn_list = split(".", subobj.DNSDOMAIN);
subobj.BASEDN = "DC=" + join(",DC=", rdn_list);
subobj.LDAPBACKEND = "users.ldb";
+ subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
return subobj;
}
diff --git a/source4/setup/provision_basedn.ldif b/source4/setup/provision_basedn.ldif
index 4111f77789..ab79319f20 100644
--- a/source4/setup/provision_basedn.ldif
+++ b/source4/setup/provision_basedn.ldif
@@ -5,5 +5,6 @@ dn: ${BASEDN}
objectClass: top
objectClass: domain
objectClass: domainDNS
+${EXTENSIBLEOBJECT}
dc: ${RDN_DC}