X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=source4%2Fscripting%2Flibjs%2Fserver_call.js;h=a8c08780f9e66f623279571b22efd8c95846fedc;hp=1ed30532065381173a16b0619e6644fdd39782f5;hb=11f3f0fa6cfb0486bdc526465dc4c0e19467a30f;hpb=67180c4ccdab56fe1f41b293f6bbea1f955e3d91;ds=sidebyside

diff --git a/source4/scripting/libjs/server_call.js b/source4/scripting/libjs/server_call.js
index 1ed30532065..a8c08780f9e 100644
--- a/source4/scripting/libjs/server_call.js
+++ b/source4/scripting/libjs/server_call.js
@@ -7,15 +7,6 @@
 
 libinclude("encoder.js");
 
-/*
-  a remote printf, for displaying stuff on smbd stdout
-*/
-function __server_printf()
-{
-	print(vsprintf(arguments));
-	return undefined;
-}
-
 /*
   register a new call
 */
@@ -30,20 +21,20 @@ function __register_call(name, func)
 */
 function __run_call() {
 	var c = this;
-	var name = form['func'];
+	var name = form['ajaj_func'];
 	if (name == undefined) {
-		println("no function name given in run_call");
+		/* no function to run */
 		return;
 	}
-	var args = form['args'];
+	var args = form['ajaj_args'];
 	if (args == undefined) {
 		println("no function arguments given in run_call");
-		return;
+		exit(0);
 	}
 	args = decodeObject(args);
 	if (c.calls[name] == undefined) {
 		println("undefined remote call " + name);
-		return;
+		exit(0);
 	}
 	var f = c.calls[name];
 	var res;
@@ -68,11 +59,12 @@ function __run_call() {
 		res = f(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
 	} else {
 		println("too many arguments for remote call: " + name);
-		return;
+		exit(0);
 	}
 	var repobj = new Object();
 	repobj.res = res;
 	write(encodeObject(repobj));
+	exit(0);
 }
 
 
@@ -86,10 +78,6 @@ function servCallObj()
 	c.add = __register_call;
 	c.run = __run_call;
 	c.calls = new Object();
-
-	/* add some basic calls */
-	c.add('printf', __server_printf);
-
 	return c;
 }