r11222: Small provision fixes: canonicalName is now generated, and the DC=

list should be from the dnsdomain (ie lowercae).

Andrew Bartlett

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index 3090626d04784e3bbacbd6c267f0a7bb74631d2e..101110ea3e03670fd791fd97a47573279df175f5 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/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/source/setup/provision.ldif b/source/setup/provision.ldif
index 8c336b8303ff36886fa194d35f317df2892576bf..42ce9027a366d3dc56c6d029f0e0187ec83d4618 100644 (file)
--- a/source/setup/provision.ldif
+++ b/source/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