svn commit: samba r20805 - in branches/SAMBA_4_0/source: scripting/libjs setup

[metze at samba.org]

Author: metze
Date: 2007-01-15 13:54:21 +0000 (Mon, 15 Jan 2007)
New Revision: 20805

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20805

Log:
don't use hardcoded values for secrects.keytab and sam.ldb

metze
Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js
   branches/SAMBA_4_0/source/setup/secrets.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2007-01-15 13:28:09 UTC (rev 20804)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2007-01-15 13:54:21 UTC (rev 20805)
@@ -382,6 +382,7 @@
 	paths.hkpt = "hkpt.ldb";
 	paths.samdb = lp.get("sam database");
 	paths.secrets = "secrets.ldb";
+	paths.keytab = "secrets.keytab";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";
 	paths.ldap_basedn_ldif = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".ldif";
@@ -431,7 +432,7 @@
 	return true;
 }
 
-function provision_fix_subobj(subobj, message)
+function provision_fix_subobj(subobj, message, paths)
 {
 	subobj.REALM       = strupper(subobj.REALM);
 	subobj.HOSTNAME    = strlower(subobj.HOSTNAME);
@@ -442,6 +443,10 @@
 	var rdns = split(",", subobj.DOMAINDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
+	subobj.SAM_LDB		= paths.samdb;
+	subobj.SECRETS_LDB	= paths.secrets;
+	subobj.SECRETS_KEYTAB	= paths.keytab;
+
 	return true;
 }
 
@@ -451,7 +456,7 @@
 	var sys = sys_init();
 	var info = new Object();
 
-	var ok = provision_fix_subobj(subobj, message);
+	var ok = provision_fix_subobj(subobj, message, paths);
 	assert(ok);
 
 	info.subobj = subobj;
@@ -491,7 +496,7 @@
 	var sys = sys_init();
 	var info = new Object();
 
-	var ok = provision_fix_subobj(subobj, message);
+	var ok = provision_fix_subobj(subobj, message, paths);
 	assert(ok);
 
 	if (subobj.DOMAINGUID != undefined) {

Modified: branches/SAMBA_4_0/source/setup/secrets.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/secrets.ldif	2007-01-15 13:28:09 UTC (rev 20804)
+++ branches/SAMBA_4_0/source/setup/secrets.ldif	2007-01-15 13:54:21 UTC (rev 20805)
@@ -36,7 +36,7 @@
 whenChanged: ${LDAPTIME}
 msDS-KeyVersionNumber: 1
 objectSid: ${DOMAINSID}
-privateKeytab: secrets.keytab
+privateKeytab: ${SECRETS_KEYTAB}
 
 # A hook from our credentials system into HDB, as we must be on a KDC,
 # we can look directly into the database.
@@ -51,5 +51,5 @@
 whenChanged: ${LDAPTIME}
 objectSid: ${DOMAINSID}
 servicePrincipalName: kadmin/changepw
-krb5Keytab: HDB:ldb:sam.ldb:
+krb5Keytab: HDB:ldb:${SAM_LDB}:
 #The trailing : here is a HACK, but it matches the Heimdal format.