Kill another sub that the modules will handle for us.

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index 175a1782ba125994d8273090f7e2b506d6f56f4e..5c4ff6877f23e1a17b439b5f4848d2654d92eb6c 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -484,9 +484,6 @@ function provision_fix_subobj(subobj, paths)
        subobj.ADMINPASS_B64   = ldb.encode(subobj.ADMINPASS);
        subobj.DNSPASS_B64     = ldb.encode(subobj.DNSPASS);
 
-       var rdns = split(",", subobj.DOMAINDN);
-       subobj.RDN_DC = substr(rdns[0], strlen("DC="));
-
        subobj.SAM_LDB          = "tdb://" + paths.samdb;
        subobj.SECRETS_KEYTAB   = paths.keytab;
        subobj.DNS_KEYTAB       = paths.dns_keytab;

diff --git a/source/setup/provision_basedn.ldif b/source/setup/provision_basedn.ldif
index 3c7537f013ad942a57f6763bfcc63cafc6cc0c7e..11eb0593e8d4f2b68fde3b873b4c8ceb92783f6c 100644 (file)
--- a/source/setup/provision_basedn.ldif
+++ b/source/setup/provision_basedn.ldif
@@ -6,5 +6,4 @@ objectClass: top
 objectClass: domain
 objectClass: domainDNS
 ${ACI}
-dc: ${RDN_DC}
 

diff --git a/source/setup/provision_basedn_modify.ldif b/source/setup/provision_basedn_modify.ldif
index fa990599d9a6a283bfc49ad29488b3e44d1a1dd2..dadfda720e39c5343a5275cdd1550cedfaf75fee 100644 (file)
--- a/source/setup/provision_basedn_modify.ldif
+++ b/source/setup/provision_basedn_modify.ldif
@@ -4,9 +4,6 @@
 dn: ${DOMAINDN}
 changetype: modify
 -
-replace: dc
-dc: ${RDN_DC}
--
 replace: forceLogoff
 forceLogoff: 9223372036854775808
 -