svn commit: samba r12929 - in branches/SAMBA_4_0/source/scripting/libjs: .

abartlet at samba.org abartlet at samba.org
Sat Jan 14 07:24:16 GMT 2006


Author: abartlet
Date: 2006-01-14 07:24:15 +0000 (Sat, 14 Jan 2006)
New Revision: 12929

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

Log:
Fix more implict global and shadowing variables.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-01-14 06:17:24 UTC (rev 12928)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-01-14 07:24:15 UTC (rev 12929)
@@ -559,17 +559,17 @@
 
 function vampire(domain, session_info, credentials, message) {
 	var ctx = NetContext(credentials);
-	vampire = new Object();
+	var vampire_ctx = new Object();
 	var machine_creds = credentials_init();
 	machine_creds.set_domain(form.DOMAIN);
 	if (!machine_creds.set_machine_account()) {
 		message("Failed to access domain join information!");
 		return false;
 	}
-	vampire.machine_creds = machine_creds;
-	vampire.session_info = session_info;
-	if (!ctx.SamSyncLdb(vampire)) {
-		message("Migration of remote domain to Samba failed: " + vampire.error_string);
+	vampire_ctx.machine_creds = machine_creds;
+	vampire_ctx.session_info = session_info;
+	if (!ctx.SamSyncLdb(vampire_ctx)) {
+		message("Migration of remote domain to Samba failed: " + vampire_ctx.error_string);
 		return false;
 	}
 	return true;



More information about the samba-cvs mailing list