Remove useless subs from the ejs provision

The less things we manually place into the templates, the easier the
conversion to python will be.

Andrew Bartlett

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index 0cca49dec912488a494c95cd236bd4880fece22d..175a1782ba125994d8273090f7e2b506d6f56f4e 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -969,9 +969,6 @@ function provision_guess()
        subobj.ADMINPASS    = randpass(12);
        subobj.LDAPMANAGERPASS     = randpass(12);
        subobj.DEFAULTSITE  = "Default-First-Site-Name";
-       subobj.NEWGUID      = randguid;
-       subobj.NTTIME       = nttime;
-       subobj.LDAPTIME     = ldaptime;
        subobj.DATESTRING   = datestring;
        subobj.ROOT         = findnss(nss.getpwnam, "root");
        subobj.NOBODY       = findnss(nss.getpwnam, "nobody");

diff --git a/source/setup/secrets_dc.ldif b/source/setup/secrets_dc.ldif
index 64469352bbfec9701fbc859c3ff1bd0c4b7ad035..71c7fc2f5b97afffbf4557ecda1872eb642ab013 100644 (file)
--- a/source/setup/secrets_dc.ldif
+++ b/source/setup/secrets_dc.ldif
@@ -7,8 +7,6 @@ realm: ${REALM}
 secret:: ${MACHINEPASS_B64}
 secureChannelType: 6
 sAMAccountName: ${NETBIOSNAME}$
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 msDS-KeyVersionNumber: 1
 objectSid: ${DOMAINSID}
 privateKeytab: ${SECRETS_KEYTAB}
@@ -22,8 +20,6 @@ objectClass: kerberosSecret
 flatname: ${DOMAIN}
 realm: ${REALM}
 sAMAccountName: krbtgt
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 objectSid: ${DOMAINSID}
 servicePrincipalName: kadmin/changepw
 krb5Keytab: HDB:ldb:${SAM_LDB}:
@@ -36,8 +32,6 @@ objectClass: top
 objectClass: secret
 objectClass: kerberosSecret
 realm: ${REALM}
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 servicePrincipalName: DNS/${DNSDOMAIN}
 privateKeytab: ${DNS_KEYTAB}
 secret:: ${DNSPASS_B64}