summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-10-20 11:19:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:05 -0500
commit17be61b7b9cff8bfc668ec1d08dc442a8ad30088 (patch)
treec4a4641a69c1e5eef2363f229730cf1edb79b9a1
parent9f672563835ee94b49e35bb932c514afacc712b2 (diff)
downloadsamba-17be61b7b9cff8bfc668ec1d08dc442a8ad30088.tar.gz
samba-17be61b7b9cff8bfc668ec1d08dc442a8ad30088.tar.bz2
samba-17be61b7b9cff8bfc668ec1d08dc442a8ad30088.zip
r11222: Small provision fixes: canonicalName is now generated, and the DC=
list should be from the dnsdomain (ie lowercae). Andrew Bartlett (This used to be commit 10d692a1c216134b301b5851ce1e71ed93cc6164)
-rw-r--r--source4/scripting/libjs/provision.js2
-rw-r--r--source4/setup/provision.ldif1
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 3090626d04..101110ea3e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -340,7 +340,7 @@ function provision_guess()
subobj.DNSNAME = sprintf("%s.%s",
strlower(subobj.HOSTNAME),
subobj.DNSDOMAIN);
- rdn_list = split(".", subobj.REALM);
+ rdn_list = split(".", subobj.DNSDOMAIN);
subobj.BASEDN = "DC=" + join(",DC=", rdn_list);
return subobj;
}
diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index 8c336b8303..42ce9027a3 100644
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -34,7 +34,6 @@ objectCategory: CN=Domain-DNS,CN=Schema,CN=Configuration,${BASEDN}
isCriticalSystemObject: TRUE
subRefs: CN=Configuration,${BASEDN}
subRefs: CN=Schema,CN=Configuration,${BASEDN}
-canonicalName: ${REALM}/
dn: CN=Users,${BASEDN}
objectClass: top