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

[abartlet at samba.org]

Author: abartlet
Date: 2006-08-28 05:26:42 +0000 (Mon, 28 Aug 2006)
New Revision: 17876

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

Log:
Require one less patch for the LDAP backend to work.

This lets the modules or backend generate the host and domain GUID,
rather than the randguid() function.  These can still be specified
from the command line.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js
   branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif
   branches/SAMBA_4_0/source/setup/provision_users.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-08-28 05:22:10 UTC (rev 17875)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-08-28 05:26:42 UTC (rev 17876)
@@ -164,6 +164,8 @@
 	ldb.del("@ATTRIBUTES");
 	ldb.del("@SUBCLASSES");
 	ldb.del("@MODULES");
+	ldb.del("@PARTITION");
+	ldb.del("@KLUDGEACL");
 
 	/* and the rest */
 	var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
@@ -198,6 +200,9 @@
 	var res = ldb.search("(objectClass=*)", "", ldb.SCOPE_BASE, rootDSE_attrs);
 	assert(typeof(res) != "undefined");
 	assert(res.length == 1);
+	if (typeof(res[0].namingContexts) == "undefined") {
+		return;
+	}	
 	for (j=0; j<res[0].namingContexts.length; j++) {
 		var attrs = new Array("dn");
 		var basedn = res[0].namingContexts[j];
@@ -416,7 +421,19 @@
 	assert(valid_netbios_name(subobj.NETBIOSNAME));
 	var rdns = split(",", subobj.BASEDN);
 	subobj.RDN_DC = substr(rdns[0], strlen("DC="));
+	
+	if (subobj.DOMAINGUID != undefined) {
+		subobj.DOMAINGUID_MOD = sprintf("replace: objectGUID\nobjectGUID: %s\n-", subobj.DOMAINGUID);
+	} else {
+		subobj.DOMAINGUID_MOD = "";
+	}
 
+	if (subobj.HOSTGUID != undefined) {
+		subobj.HOSTGUID_ADD = sprintf("objectGUID: %s", subobj.HOSTGUID);
+	} else {
+		subobj.HOSTGUID_ADD = "";
+	}
+
 	info.subobj = subobj;
 	info.message = message;
 	info.credentials = credentials;
@@ -525,7 +542,9 @@
 	var ok = ldb.connect(paths.samdb);
 	assert(ok);
 
-	/* These values may have changed, due to an incoming SamSync, so fetch them from the database */
+	/* These values may have changed, due to an incoming SamSync,
+           or may not have been specified, so fetch them from the database */
+
 	var attrs = new Array("objectGUID");
 	res = ldb.search("objectGUID=*", subobj.BASEDN, ldb.SCOPE_BASE, attrs);
 	assert(res.length == 1 && res[0].objectGUID != undefined)
@@ -574,12 +593,10 @@
 	assert(subobj.REALM);
 	assert(subobj.DOMAIN);
 	assert(subobj.HOSTNAME);
-
+	
 	subobj.VERSION      = version();
 	subobj.HOSTIP       = hostip();
-	subobj.DOMAINGUID   = randguid();
 	subobj.DOMAINSID    = randsid();
-	subobj.HOSTGUID     = randguid();
 	subobj.INVOCATIONID = randguid();
 	subobj.KRBTGTPASS   = randpass(12);
 	subobj.MACHINEPASS  = randpass(12);

Modified: branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif	2006-08-28 05:22:10 UTC (rev 17875)
+++ branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif	2006-08-28 05:26:42 UTC (rev 17876)
@@ -9,9 +9,6 @@
 replace: dc
 dc: ${RDN_DC}
 -
-replace: objectGUID
-objectGUID: ${DOMAINGUID}
--
 replace: forceLogoff
 forceLogoff: 9223372036854775808
 -
@@ -79,4 +76,5 @@
 subRefs: CN=Configuration,${BASEDN}
 subRefs: CN=Schema,CN=Configuration,${BASEDN}
 -
+${DOMAINGUID_MOD}
 

Modified: branches/SAMBA_4_0/source/setup/provision_users.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_users.ldif	2006-08-28 05:22:10 UTC (rev 17875)
+++ branches/SAMBA_4_0/source/setup/provision_users.ldif	2006-08-28 05:26:42 UTC (rev 17876)
@@ -71,7 +71,6 @@
 dn: CN=${NETBIOSNAME},CN=Domain Controllers,${BASEDN}
 objectClass: computer
 cn: ${NETBIOSNAME}
-objectGUID: ${HOSTGUID}
 userAccountControl: 532480
 localPolicyFlags: 0
 primaryGroupID: 516
@@ -89,8 +88,8 @@
 servicePrincipalName: HOST/${NETBIOSNAME}/${REALM}
 servicePrincipalName: HOST/${DNSNAME}/${DOMAIN}
 servicePrincipalName: HOST/${NETBIOSNAME}/${DOMAIN}
+${HOSTGUID_ADD}
 
-
 dn: CN=Users,CN=Builtin,${BASEDN}
 objectClass: top
 objectClass: group