From f52a74021512aace67f7ecba33ed130102f47533 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 00:13:10 +0000
Subject: r7061: A ejs scripting client.  This should allow javascript to be
 run in a command line environment instead of inside the web server.

It doesn't work yet though, rather an exception is thrown when trying
to call ejsDefineStringCFunction().
(This used to be commit 3444cd5429dfef5a67d5bf7818ae08e4e8cc5ccc)
---
 source4/scripting/ejs/smbscript.c | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 source4/scripting/ejs/smbscript.c

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
new file mode 100644
index 0000000000..f1c3f0b46d
--- /dev/null
+++ b/source4/scripting/ejs/smbscript.c
@@ -0,0 +1,62 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Standalone client for ESP scripting.
+
+   Copyright (C) Tim Potter <tpot@samba.org> 2005
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "web_server/ejs/ejs.h"
+
+void http_exception(const char *reason)
+{
+	fprintf(stderr, "smbscript exception: %s", reason);
+	exit(1);
+}
+
+extern void		ejsDefineStringCFunction(EjsId eid, const char *functionName, 
+					MprStringCFunction fn, void *thisPtr, int flags);
+
+static int writeProc(MprVarHandle userHandle, int argc, char **argv)
+{
+	int i;
+
+	mprAssert(argv);
+	for (i = 0; i < argc; i++) {
+		printf("%s", argv[i]);
+	}
+	return 0;
+}
+
+ int main(int argc, const char *argv[])
+{
+	EjsId eid;
+	EjsHandle primary, alternate;
+	MprVar result;
+	char *emsg;
+
+	ejsOpen(0, 0, 0);
+	eid = ejsOpenEngine(primary, alternate);
+	ejsDefineStringCFunction(eid, "write", writeProc, NULL, 0);
+	ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg);
+	ejsClose();
+
+	printf("emsg = %s\n", emsg);
+
+	return 0;
+}
-- 
cgit 


From e95c8f19116813dd03cce957c3367254782915fd Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 03:25:21 +0000
Subject: r7063: Do error checking on the ejs functions.

Tridge says there is a bug in defining per-engine CFunction's so move
calls to ejsDefineStringCFunction() above the ejsOpenEngine() call.

Test script now works!
(This used to be commit 5e2458ae6c863ff29b85fff3d093f7f4fa9dc2be)
---
 source4/scripting/ejs/smbscript.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f1c3f0b46d..85064d3b44 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -29,9 +29,6 @@ void http_exception(const char *reason)
 	exit(1);
 }
 
-extern void		ejsDefineStringCFunction(EjsId eid, const char *functionName, 
-					MprStringCFunction fn, void *thisPtr, int flags);
-
 static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 {
 	int i;
@@ -50,13 +47,26 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 	MprVar result;
 	char *emsg;
 
-	ejsOpen(0, 0, 0);
-	eid = ejsOpenEngine(primary, alternate);
-	ejsDefineStringCFunction(eid, "write", writeProc, NULL, 0);
-	ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg);
-	ejsClose();
+	if (ejsOpen(0, 0, 0) != 0) {
+		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
+			"EJ subsystem\n");
+		exit(1);
+	}
 
-	printf("emsg = %s\n", emsg);
+	ejsDefineStringCFunction(-1, "write", writeProc, NULL, 0);
+
+	if ((eid = ejsOpenEngine(primary, alternate)) == (EjsId)-1) {
+		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
+			"initialise an EJS engine\n");
+		exit(1);
+	}
+
+	if (ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg) == -1) {
+		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
+		exit(1);
+	}
+
+	ejsClose();
 
 	return 0;
 }
-- 
cgit 


From de850cb754f8ea49acc80e4303a9835578768154 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 03:29:10 +0000
Subject: r7064: Clean up handle parameter passing after peeking at tridge's
 ejstest.c (This used to be commit 805b6c7cf0f1e05fbb690bdfc93938747e13e6cd)

---
 source4/scripting/ejs/smbscript.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 85064d3b44..1c823a4d8e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -43,11 +43,11 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
  int main(int argc, const char *argv[])
 {
 	EjsId eid;
-	EjsHandle primary, alternate;
+	EjsHandle handle;
 	MprVar result;
 	char *emsg;
 
-	if (ejsOpen(0, 0, 0) != 0) {
+	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
 		exit(1);
@@ -55,13 +55,13 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 
 	ejsDefineStringCFunction(-1, "write", writeProc, NULL, 0);
 
-	if ((eid = ejsOpenEngine(primary, alternate)) == (EjsId)-1) {
+	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
 			"initialise an EJS engine\n");
 		exit(1);
 	}
 
-	if (ejsEvalScript(0, "write(\"hello\n\");", &result, &emsg) == -1) {
+	if (ejsEvalScript(eid, "write(\"hello\n\");", &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
-- 
cgit 


From 14ade23914b328fcb5924488c2416dfa7748e4ab Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 03:53:36 +0000
Subject: r7065: Move ejs from web_server to lib so it can be shared with
 smbscript. (This used to be commit b83dc8fbfb9ffe30654bc4869398f50dd9ccccb7)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 1c823a4d8e..f1ff03ae49 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "web_server/ejs/ejs.h"
+#include "lib/ejs/ejs.h"
 
 void http_exception(const char *reason)
 {
-- 
cgit 


From 7756b990f38495bf98e335b56bdc510659c34bdb Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 04:10:22 +0000
Subject: r7066: Rename http_exception to ejs_exception. (This used to be
 commit f2e59d3adfd7813c3c2090350f8ff2a99a5533e9)

---
 source4/scripting/ejs/smbscript.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f1ff03ae49..0b0a446839 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/ejs/ejs.h"
 
-void http_exception(const char *reason)
+void ejs_exception(const char *reason)
 {
 	fprintf(stderr, "smbscript exception: %s", reason);
 	exit(1);
@@ -61,7 +61,7 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 		exit(1);
 	}
 
-	if (ejsEvalScript(eid, "write(\"hello\n\");", &result, &emsg) == -1) {
+	if (ejsEvalFile(eid, (char *)argv[1], &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
-- 
cgit 


From 21f3a3921c03777beb7e3072152ae33956b38807 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 29 May 2005 08:12:16 +0000
Subject: r7069: Add a little usage message to smbscript and fix a compiler
 warning. My compiler still complains about "handle"
 (scripting/ejs/smbscrip.c:46) possibly not being initialized and to me this
 looks true.

Running smbscript with the trivial write("Hello, world\n"); also leaves some
memory around.

Volker
(This used to be commit 06d27a19213dc8fe6dfc948a5e8cbafa74db7a29)
---
 source4/scripting/ejs/smbscript.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 0b0a446839..57f42688d6 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -47,6 +47,11 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 	MprVar result;
 	char *emsg;
 
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
+		exit(1);
+	}
+
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
@@ -61,7 +66,8 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 		exit(1);
 	}
 
-	if (ejsEvalFile(eid, (char *)argv[1], &result, &emsg) == -1) {
+	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
+			&emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
-- 
cgit 


From 8754c793bfe79e87febb026e5915e054c23cfede Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 11:35:56 +0000
Subject: r7072: moved the esp hooks calls to the ejs level, so we can call
 them from both esp scripts and ejs scripts. This allows the smbscript program
 to call all the existing extension calls like lpGet() and ldbSearch()

Also fixed smbscript to load smb.conf, and setup logging for DEBUG()

I left the unixAuth() routine in web_server/calls.c at the moment, as
that is really only useful for esp scripts. I imagine that as we
extend esp/ejs, we will put some functions in scripting/ejs/ for use
in both ejs and esp, and some functions in web_server/ where they will
only be accessed by esp web scripts
(This used to be commit e59ae64f60d388a5634559e4e0887e4676b70871)
---
 source4/scripting/ejs/smbscript.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 57f42688d6..593d3b0cf5 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "dynconfig.h"
 #include "lib/ejs/ejs.h"
 
 void ejs_exception(const char *reason)
@@ -29,36 +30,36 @@ void ejs_exception(const char *reason)
 	exit(1);
 }
 
-static int writeProc(MprVarHandle userHandle, int argc, char **argv)
-{
-	int i;
-
-	mprAssert(argv);
-	for (i = 0; i < argc; i++) {
-		printf("%s", argv[i]);
-	}
-	return 0;
-}
-
  int main(int argc, const char *argv[])
 {
 	EjsId eid;
 	EjsHandle handle;
 	MprVar result;
 	char *emsg;
+	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
 	if (argc != 2) {
 		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
 		exit(1);
 	}
 
+	setup_logging(argv[0],DEBUG_STDOUT);
+
+	if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
+			argv[0], dyn_CONFIGFILE);
+		exit(1);
+	}
+
+	mprSetCtx(mem_ctx);
+
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
 		exit(1);
 	}
 
-	ejsDefineStringCFunction(-1, "write", writeProc, NULL, 0);
+	smb_setup_ejs_functions();
 
 	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
@@ -74,5 +75,7 @@ static int writeProc(MprVarHandle userHandle, int argc, char **argv)
 
 	ejsClose();
 
+	talloc_free(mem_ctx);
+
 	return 0;
 }
-- 
cgit 


From 8f84f7cdecf12396eb5c1723e5e1ccf813cd9a51 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 11:43:52 +0000
Subject: r7074: we should load all shares in smbscript (This used to be commit
 92f85507df2bce5e246484860a43748321f2291e)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 593d3b0cf5..c6b1b7a192 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -45,7 +45,7 @@ void ejs_exception(const char *reason)
 
 	setup_logging(argv[0],DEBUG_STDOUT);
 
-	if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+	if (!lp_load(dyn_CONFIGFILE, False, False, False)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
 			argv[0], dyn_CONFIGFILE);
 		exit(1);
-- 
cgit 


From f477a741293673adad784c55a749031a290bd072 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 11:58:14 +0000
Subject: r7075: added support for ARGV[] in ejs scripts (This used to be
 commit 3db568eb6bb383c4c1e1fd0c7f043a9914dcc3cc)

---
 source4/scripting/ejs/smbscript.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index c6b1b7a192..3378885147 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -37,8 +37,11 @@ void ejs_exception(const char *reason)
 	MprVar result;
 	char *emsg;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
+	const char **argv_list = NULL;
+	struct MprVar v;
+	int i;
 
-	if (argc != 2) {
+	if (argc < 2) {
 		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
 		exit(1);
 	}
@@ -67,6 +70,14 @@ void ejs_exception(const char *reason)
 		exit(1);
 	}
 
+	/* setup ARGV[] in the ejs environment */
+	for (i=2;i<argc;i++) {
+		argv_list = str_list_add(argv_list, argv[i]);
+	}
+	v = mprList("ARGV", argv_list);
+	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
+
+	/* run the script */
 	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
 			&emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
-- 
cgit 


From 09e00bbdc18741c20f2eeba83da742f056115789 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 29 May 2005 12:41:59 +0000
Subject: r7078: - fix an uninitialised variable in smbscript

- fixed handle passing in the smb/ejs interface calls, so they can be called
  safely from esp
(This used to be commit 45ea1b64413de577366939b2106f657f6c47b1bd)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 3378885147..021dafa4ae 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -33,7 +33,7 @@ void ejs_exception(const char *reason)
  int main(int argc, const char *argv[])
 {
 	EjsId eid;
-	EjsHandle handle;
+	EjsHandle handle = 0;
 	MprVar result;
 	char *emsg;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
-- 
cgit 


From 0b2f972c8a5205f648ed747b04c5232c694afd30 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 21:45:38 +0000
Subject: r7080: Fix typo in error message. (This used to be commit
 fcf177c86e2bfbc993352b80824487e5df0a3f63)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 021dafa4ae..a15fce57b0 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -80,7 +80,7 @@ void ejs_exception(const char *reason)
 	/* run the script */
 	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
 			&emsg) == -1) {
-		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
+		fprintf(stderr, "smbscript: ejsEvalFile(): %s\n", emsg);
 		exit(1);
 	}
 
-- 
cgit 


From 520e2258c9949f9129a2e124035c0200c0c59b39 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 29 May 2005 22:11:32 +0000
Subject: r7082: Call load_interfaces() in smbscript initialisation. (This used
 to be commit 54051bf8bbb18653adafb37cc6181617ca60b781)

---
 source4/scripting/ejs/smbscript.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a15fce57b0..754a49ccb1 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -54,6 +54,8 @@ void ejs_exception(const char *reason)
 		exit(1);
 	}
 
+	load_interfaces();
+
 	mprSetCtx(mem_ctx);
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
-- 
cgit 


From afeaf137c4cbcbde1d6e4c9921bb769a1d486aff Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 3 Jun 2005 08:00:42 +0000
Subject: r7215: Convert smbscript to use ejsEvalScript() and file_load()
 instead of ejsEvalFile().

Still need to add advancement of the script past the hash-bang line but
it's home time now!!
(This used to be commit 14a2053c045a2df1d68838900c833c2a15cb5a36)
---
 source4/scripting/ejs/smbscript.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 754a49ccb1..323e604f8d 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -35,7 +35,8 @@ void ejs_exception(const char *reason)
 	EjsId eid;
 	EjsHandle handle = 0;
 	MprVar result;
-	char *emsg;
+	char *emsg, *script;
+	size_t script_size;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
 	struct MprVar v;
@@ -79,10 +80,12 @@ void ejs_exception(const char *reason)
 	v = mprList("ARGV", argv_list);
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
+	/* load the script and advance past interpreter line*/
+	script = file_load(argv[1], &script_size);
+
 	/* run the script */
-	if (ejsEvalFile(eid, discard_const_p(char, argv[1]), &result,
-			&emsg) == -1) {
-		fprintf(stderr, "smbscript: ejsEvalFile(): %s\n", emsg);
+	if (ejsEvalScript(eid, script, &result, &emsg) == -1) {
+		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
 		exit(1);
 	}
 
-- 
cgit 


From c1b95bd467109793333c15ea44ec910ffe3e86b4 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 3 Jun 2005 12:04:26 +0000
Subject: r7223: Advance script past interpreter line. (This used to be commit
 31b9fadbed656f666f587a9dcb5a7627a2d388aa)

---
 source4/scripting/ejs/smbscript.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 323e604f8d..43a9377143 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -83,6 +83,17 @@ void ejs_exception(const char *reason)
 	/* load the script and advance past interpreter line*/
 	script = file_load(argv[1], &script_size);
 
+	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
+		script += 2;
+		script_size -= 2;
+		while (script_size) {
+			if (*script == '\r' || *script == '\n')
+				break;
+			script++;
+			script_size--;
+		}
+	}
+
 	/* run the script */
 	if (ejsEvalScript(eid, script, &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
-- 
cgit 


From d6555cadb7015d407a2a17538d8a1ccd073a41e6 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 03:35:38 +0000
Subject: r7262: Add a length property to ARGV array. (This used to be commit
 4b775c619b7abed52d158ab70505320753a0c9cb)

---
 source4/scripting/ejs/smbscript.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 43a9377143..4bde40a955 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -78,6 +78,7 @@ void ejs_exception(const char *reason)
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
 	v = mprList("ARGV", argv_list);
+	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(argc - 2));
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
 	/* load the script and advance past interpreter line*/
-- 
cgit 


From 32f2e9806b267782125fed3a6162ea895e634eef Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 4 Jun 2005 03:51:38 +0000
Subject: r7263: Exit smbscript with the intepreter return value (defaults to
 0).

Change the exit value for an exception, usage error and other non-js
errors to 127 which is kinda like the return value for the system(3)
function.
(This used to be commit c77a232b1152a27e2d8ffb719aefba6c6b2ba6df)
---
 source4/scripting/ejs/smbscript.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 4bde40a955..02a3aff28e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
 
-   Standalone client for ESP scripting.
+   Standalone client for ejs scripting.
 
    Copyright (C) Tim Potter <tpot@samba.org> 2005
 
@@ -27,7 +27,7 @@
 void ejs_exception(const char *reason)
 {
 	fprintf(stderr, "smbscript exception: %s", reason);
-	exit(1);
+	exit(127);
 }
 
  int main(int argc, const char *argv[])
@@ -39,12 +39,12 @@ void ejs_exception(const char *reason)
 	size_t script_size;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
-	struct MprVar v;
-	int i;
+	struct MprVar v, *return_var;
+	int exit_status, i;
 
 	if (argc < 2) {
 		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
-		exit(1);
+		exit(127);
 	}
 
 	setup_logging(argv[0],DEBUG_STDOUT);
@@ -52,7 +52,7 @@ void ejs_exception(const char *reason)
 	if (!lp_load(dyn_CONFIGFILE, False, False, False)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
 			argv[0], dyn_CONFIGFILE);
-		exit(1);
+		exit(127);
 	}
 
 	load_interfaces();
@@ -62,7 +62,7 @@ void ejs_exception(const char *reason)
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
-		exit(1);
+		exit(127);
 	}
 
 	smb_setup_ejs_functions();
@@ -70,7 +70,7 @@ void ejs_exception(const char *reason)
 	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
 			"initialise an EJS engine\n");
-		exit(1);
+		exit(127);
 	}
 
 	/* setup ARGV[] in the ejs environment */
@@ -98,12 +98,15 @@ void ejs_exception(const char *reason)
 	/* run the script */
 	if (ejsEvalScript(eid, script, &result, &emsg) == -1) {
 		fprintf(stderr, "smbscript: ejsEvalScript(): %s\n", emsg);
-		exit(1);
+		exit(127);
 	}
 
+	return_var = ejsGetReturnValue(eid);
+	exit_status = return_var->integer;
+
 	ejsClose();
 
 	talloc_free(mem_ctx);
 
-	return 0;
+	return exit_status;
 }
-- 
cgit 


From 9e555f75e2b4982804f8effb4f2b4da689d714e8 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 12 Jun 2005 06:37:25 +0000
Subject: r7500: Initialise module subsystems. (This used to be commit
 564dfe14d00e80a0d373ab0fc17803ffaac0892e)

---
 source4/scripting/ejs/smbscript.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 02a3aff28e..68d94f6d2a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -57,6 +57,8 @@ void ejs_exception(const char *reason)
 
 	load_interfaces();
 
+	smbscript_init_subsystems;
+
 	mprSetCtx(mem_ctx);
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
-- 
cgit 


From 00e2b7c1b49b128488cf977b40b086b935fb605a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Jun 2005 10:01:11 +0000
Subject: r7530: Simply calling convention of lp_load().

This always loads all the services, as we now don't have an easy way
to split out smbd.

Andrew Bartlett
(This used to be commit 990e061939c76b559c4f5914c5fc6ca1b13e19dd)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 68d94f6d2a..2795e4f127 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -49,7 +49,7 @@ void ejs_exception(const char *reason)
 
 	setup_logging(argv[0],DEBUG_STDOUT);
 
-	if (!lp_load(dyn_CONFIGFILE, False, False, False)) {
+	if (!lp_load(dyn_CONFIGFILE)) {
 		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
 			argv[0], dyn_CONFIGFILE);
 		exit(127);
-- 
cgit 


From 643e5d8239ba105a5ac99ecc513289a17402714b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 2 Jul 2005 05:21:17 +0000
Subject: r8069: the beginnings of code to allow rpc calls to be made from ejs

tpot, note that this shows how you can modify passed in MprVar
variables in C call
(This used to be commit a782541db3de6ca3b599a220265cf9e6cb0c4d7b)
---
 source4/scripting/ejs/smbscript.c | 43 +++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 15 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 2795e4f127..aa0fc42c48 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -4,6 +4,7 @@
    Standalone client for ejs scripting.
 
    Copyright (C) Tim Potter <tpot@samba.org> 2005
+   Copyright (C) Andrew Tridgell 2005
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
 #include "lib/ejs/ejs.h"
 
@@ -30,7 +32,7 @@ void ejs_exception(const char *reason)
 	exit(127);
 }
 
- int main(int argc, const char *argv[])
+ int main(int argc, const char **argv)
 {
 	EjsId eid;
 	EjsHandle handle = 0;
@@ -39,28 +41,39 @@ void ejs_exception(const char *reason)
 	size_t script_size;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
+	const char *fname;
 	struct MprVar v, *return_var;
 	int exit_status, i;
+	poptContext pc;
+	int opt;
+	struct poptOption long_options[] = {
+		POPT_AUTOHELP
+		POPT_COMMON_SAMBA
+		POPT_COMMON_CREDENTIALS
+		POPT_COMMON_VERSION
+		POPT_TABLEEND
+	};
 
-	if (argc < 2) {
-		fprintf(stderr, "Usage: %s <scriptfile>\n", argv[0]);
-		exit(127);
-	}
+	popt_common_dont_ask();
 
-	setup_logging(argv[0],DEBUG_STDOUT);
+	pc = poptGetContext("smbscript", argc, argv, long_options, 0);
 
-	if (!lp_load(dyn_CONFIGFILE)) {
-		fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n",
-			argv[0], dyn_CONFIGFILE);
-		exit(127);
-	}
+	poptSetOtherOptionHelp(pc, "<script> <args> ...");
 
-	load_interfaces();
+	while((opt = poptGetNextOpt(pc)) != -1) /* noop */ ;
 
 	smbscript_init_subsystems;
 
 	mprSetCtx(mem_ctx);
 
+	argv = poptGetArgs(pc);
+	if (argv == NULL ||
+	    argv[0] == NULL) {
+		poptPrintUsage(pc, stdout, 0);
+		exit(1);
+	}
+	fname = argv[0];
+
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
 			"EJ subsystem\n");
@@ -76,15 +89,15 @@ void ejs_exception(const char *reason)
 	}
 
 	/* setup ARGV[] in the ejs environment */
-	for (i=2;i<argc;i++) {
+	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
 	v = mprList("ARGV", argv_list);
-	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(argc - 2));
+	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
 	/* load the script and advance past interpreter line*/
-	script = file_load(argv[1], &script_size);
+	script = file_load(fname, &script_size);
 
 	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
 		script += 2;
-- 
cgit 


From c11204339ae86604a6edd6491f5ee03bf5e3c950 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 8 Jul 2005 04:55:07 +0000
Subject: r8220: added auto-generation of ENUM constants in ejs wrapper. So we
 can now use the enum name instead of a integer in ejs scripts making rpc
 calls (This used to be commit a61cdee384c3002860016c1740276529493d318d)

---
 source4/scripting/ejs/smbscript.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index aa0fc42c48..244ae0b42a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -88,6 +88,8 @@ void ejs_exception(const char *reason)
 		exit(127);
 	}
 
+	smb_setup_ejs_constants(eid);
+
 	/* setup ARGV[] in the ejs environment */
 	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
-- 
cgit 


From 76ecf81428c161a98a5621b55a64cb8515f80585 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 01:10:09 +0000
Subject: r8273: fixed some memory leaks in smbscript. This required converting
 file_load() to use talloc, which impacted quite a few bits of code, including
 our smb.conf processing.

took the opportunity to remove the gloabls in params.c while doing this
(This used to be commit b220756cb4f1d201ba3e771ca67e4bfae5eae748)
---
 source4/scripting/ejs/smbscript.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 244ae0b42a..f7556b5384 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -94,12 +94,13 @@ void ejs_exception(const char *reason)
 	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
+	talloc_steal(mem_ctx, argv_list);
 	v = mprList("ARGV", argv_list);
 	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
 	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
 
 	/* load the script and advance past interpreter line*/
-	script = file_load(fname, &script_size);
+	script = file_load(fname, &script_size, mem_ctx);
 
 	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
 		script += 2;
-- 
cgit 


From 60ec75cbc7dccfceec9c57799e2af5be21a08609 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 02:37:50 +0000
Subject: r8276: fixed the remaining memory leaks in smbscript. We can now loop
 doing lots of rpc calls without memory usage increasing. (This used to be
 commit 9c885a7edb771486793eb287288158157b34e8f3)

---
 source4/scripting/ejs/smbscript.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f7556b5384..80ef96e1af 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -25,6 +25,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
 #include "lib/ejs/ejs.h"
+#include "scripting/ejs/smbcalls.h"
 
 void ejs_exception(const char *reason)
 {
@@ -97,7 +98,7 @@ void ejs_exception(const char *reason)
 	talloc_steal(mem_ctx, argv_list);
 	v = mprList("ARGV", argv_list);
 	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
-	mprCreateProperty(ejsGetGlobalObject(eid), "ARGV", &v);
+	mprSetVar(ejsGetGlobalObject(eid), "ARGV", v);
 
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
-- 
cgit 


From 056096c30ba73cbc5304c99af5d5a08d89111aab Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Jul 2005 08:35:18 +0000
Subject: r8284: - fixed some uninitialised variables in the irpc code

- added code to send multiple irpc calls in parallel, to all servers
  that have registered the given name, with output going in
  io.results[i]. This allows you to make rpc calls to multiple servers
  at once, which is needed for clients like smbstatus
(This used to be commit 061e20e509d95ffe16d7dd6fba7db39fc7a165ed)
---
 source4/scripting/ejs/smbscript.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 80ef96e1af..bf9049af36 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -97,7 +97,6 @@ void ejs_exception(const char *reason)
 	}
 	talloc_steal(mem_ctx, argv_list);
 	v = mprList("ARGV", argv_list);
-	mprSetPropertyValue(&v, "length", mprCreateIntegerVar(i-1));
 	mprSetVar(ejsGetGlobalObject(eid), "ARGV", v);
 
 	/* load the script and advance past interpreter line*/
-- 
cgit 


From f583a85d4d520b0ab6ca83efd36e71563108b370 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Jul 2005 07:42:43 +0000
Subject: r8316: give full access to the popt command line parsing in ejs
 scripts, including access to the samba common options. For example:

ok = GetOptions(ARGV, options,
		"POPT_AUTOHELP",
		"POPT_COMMON_SAMBA",
		"myopt=s",
		"intopt=i",
		"noopt");

this allows scripts to support their own extended options properly
(This used to be commit 775fb56ac287b8d485b38f633b9480d7b7ab64e3)
---
 source4/scripting/ejs/smbscript.c | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index bf9049af36..691cd44730 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
 #include "lib/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
@@ -43,37 +42,18 @@ void ejs_exception(const char *reason)
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
 	const char **argv_list = NULL;
 	const char *fname;
-	struct MprVar v, *return_var;
+	struct MprVar *return_var;
 	int exit_status, i;
-	poptContext pc;
-	int opt;
-	struct poptOption long_options[] = {
-		POPT_AUTOHELP
-		POPT_COMMON_SAMBA
-		POPT_COMMON_CREDENTIALS
-		POPT_COMMON_VERSION
-		POPT_TABLEEND
-	};
-
-	popt_common_dont_ask();
-
-	pc = poptGetContext("smbscript", argc, argv, long_options, 0);
-
-	poptSetOtherOptionHelp(pc, "<script> <args> ...");
-
-	while((opt = poptGetNextOpt(pc)) != -1) /* noop */ ;
 
 	smbscript_init_subsystems;
-
 	mprSetCtx(mem_ctx);
 
-	argv = poptGetArgs(pc);
-	if (argv == NULL ||
-	    argv[0] == NULL) {
-		poptPrintUsage(pc, stdout, 0);
+	if (argc < 2) {
+		fprintf(stderr, "You must supply a script name\n");
 		exit(1);
 	}
-	fname = argv[0];
+
+	fname = argv[1];
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
@@ -96,8 +76,7 @@ void ejs_exception(const char *reason)
 		argv_list = str_list_add(argv_list, argv[i]);
 	}
 	talloc_steal(mem_ctx, argv_list);
-	v = mprList("ARGV", argv_list);
-	mprSetVar(ejsGetGlobalObject(eid), "ARGV", v);
+	mprSetVar(ejsGetGlobalObject(eid), "ARGV", mprList("ARGV", argv_list));
 
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
-- 
cgit 


From 6b38e62f0a004103def69244d39c6bc3e607aa9f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 12 Jul 2005 07:15:22 +0000
Subject: r8357: Call lp_load() so we can access the various lp_functions().
 (This used to be commit f76a7ec2a2ef5db7ca7dced519474495d7ea02dc)

---
 source4/scripting/ejs/smbscript.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 691cd44730..d999ba072a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -48,6 +48,8 @@ void ejs_exception(const char *reason)
 	smbscript_init_subsystems;
 	mprSetCtx(mem_ctx);
 
+	lp_load(dyn_CONFIGFILE);
+
 	if (argc < 2) {
 		fprintf(stderr, "You must supply a script name\n");
 		exit(1);
-- 
cgit 


From adbb1612c12d03fa94e4ee23fbc2fa96c09d9dcd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Jul 2005 00:06:38 +0000
Subject: r8399: move the ejs and esp code closer to the directory layout used
 by the upstream sources. This makes it much easier to keep it up to date.

I will separate out the mpr code into lib/appweb/mpr next
(This used to be commit 52db7a052baeb0f11361ed69b71cb790039e3cc9)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d999ba072a..7e014716c2 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "dynconfig.h"
-#include "lib/ejs/ejs.h"
+#include "lib/appweb/ejs/ejs.h"
 #include "scripting/ejs/smbcalls.h"
 
 void ejs_exception(const char *reason)
-- 
cgit 


From a3b0bb89b433925110a00b8e87853131856e5ee9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Jul 2005 05:30:23 +0000
Subject: r8411: we need to use mprVarToNumber() instead of var->integer now,
 to cope with the 64 bit integer support

this fixes the exit status from smbscript
(This used to be commit f476e7aeec56a921fd286d3fe2cb0a229e57a9e8)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 7e014716c2..dec9592c46 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -101,7 +101,7 @@ void ejs_exception(const char *reason)
 	}
 
 	return_var = ejsGetReturnValue(eid);
-	exit_status = return_var->integer;
+	exit_status = mprVarToNumber(return_var);
 
 	ejsClose();
 
-- 
cgit 


From 0e5907d57cdfb0c1ce3f151161a9260c14466bd0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Jul 2005 07:21:59 +0000
Subject: r8452: allow for the ugly hack:

#!/bin/sh
exec smbscript "$0" ${1+"$@"}

which is needed because bloody solaris puts 'env' in /bin instead of /usr/bin

also neaten up the #! handling code.
(This used to be commit 778bcd3738e42d8adfd4529f790c898f0d904363)
---
 source4/scripting/ejs/smbscript.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index dec9592c46..d71d084779 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -83,15 +83,15 @@ void ejs_exception(const char *reason)
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
 
-	if ((script_size > 2) && script[0] == '#' && script[1] == '!') {
-		script += 2;
-		script_size -= 2;
-		while (script_size) {
-			if (*script == '\r' || *script == '\n')
-				break;
-			script++;
-			script_size--;
-		}
+	/* allow scriptable js */
+	if (strncmp(script, "#!", 2) == 0) {
+		script += strcspn(script, "\r\n");
+		script += strspn(script, "\r\n");
+	}
+	/* and this copes with the ugly exec hack */
+	if (strncmp(script, "exec ", 5) == 0) {
+		script += strcspn(script, "\r\n");
+		script += strspn(script, "\r\n");
 	}
 
 	/* run the script */
-- 
cgit 


From a0bc4da1a307753e3b28a11863f50d66b0894190 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Jul 2005 07:18:23 +0000
Subject: r8483: switched our generated ejs rpc code over to the new OO
 interface. This means we don't pollute the name space, and also makes for
 faster startup times as we only create variables for the pipes that we use,
 not all pipes (This used to be commit
 57d7a585e8162d21c7152952aa0cc7471968784f)

---
 source4/scripting/ejs/smbscript.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d71d084779..8359629a85 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -71,8 +71,6 @@ void ejs_exception(const char *reason)
 		exit(127);
 	}
 
-	smb_setup_ejs_constants(eid);
-
 	/* setup ARGV[] in the ejs environment */
 	for (i=1;argv[i];i++) {
 		argv_list = str_list_add(argv_list, argv[i]);
-- 
cgit 


From 2f5f01567b4c30cd764843a1ca0c7ab6d9bc0882 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 20 Jul 2005 10:07:48 +0000
Subject: r8643: - make lp_configfile() work again

- get rid of redundeny dyn_CONFIGFILE argument to lp_load()

- fixed provisioning to work with completely pristine install,
  creating an initial smb.conf is none is present

- added lp.set() and lp.reload() to loadparm ejs object interface
(This used to be commit c2691ef7126ddcee5f95970b78759b40a049d0a7)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 8359629a85..c6155dcbeb 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -48,7 +48,7 @@ void ejs_exception(const char *reason)
 	smbscript_init_subsystems;
 	mprSetCtx(mem_ctx);
 
-	lp_load(dyn_CONFIGFILE);
+	lp_load();
 
 	if (argc < 2) {
 		fprintf(stderr, "You must supply a script name\n");
-- 
cgit 


From a369f0ecaf35fb49652873c4c1ddcaf28629c26e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 21 Jul 2005 12:11:52 +0000
Subject: r8678: setup for gdb backtrace in 'make test' (This used to be commit
 acf8c8fd4995acef47390df5a7d4e611c597367d)

---
 source4/scripting/ejs/smbscript.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index c6155dcbeb..b16536a575 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -45,6 +45,7 @@ void ejs_exception(const char *reason)
 	struct MprVar *return_var;
 	int exit_status, i;
 
+	fault_setup(argv[0]);
 	smbscript_init_subsystems;
 	mprSetCtx(mem_ctx);
 
-- 
cgit 


From 8f9478b09d39d8c13871684a6af3d3e1629a0e84 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 23 Aug 2005 05:21:04 +0000
Subject: r9504: use some low level ejs hackery to give much better exception
 error messages in both the web server and smbscript. We can now give
 backtraces for all internal asserts, not just high level errors (This used to
 be commit 84c756b25ccb2bd75360bdb9b7b7643975d1f3b3)

---
 source4/scripting/ejs/smbscript.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index b16536a575..a35b988e56 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -24,17 +24,21 @@
 #include "includes.h"
 #include "dynconfig.h"
 #include "lib/appweb/ejs/ejs.h"
+#include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
 
+static EjsId eid;
+
 void ejs_exception(const char *reason)
 {
-	fprintf(stderr, "smbscript exception: %s", reason);
+	Ejs *ep = ejsPtr(eid);
+	ejsSetErrorMsg(eid, "%s", reason);
+	fprintf(stderr, "%s", ep->error);
 	exit(127);
 }
 
  int main(int argc, const char **argv)
 {
-	EjsId eid;
 	EjsHandle handle = 0;
 	MprVar result;
 	char *emsg, *script;
-- 
cgit 


From d152839e299e7e406bb938c5b413ad975a895d6f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 28 Aug 2005 23:03:49 +0000
Subject: r9722: Initial attempt at converting samba3dump to EJS.. (This used
 to be commit 7e3b94dfb9c421793dab7813b96ca63da4b33960)

---
 source4/scripting/ejs/smbscript.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a35b988e56..f8d6d507d4 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -86,6 +86,11 @@ void ejs_exception(const char *reason)
 	/* load the script and advance past interpreter line*/
 	script = file_load(fname, &script_size, mem_ctx);
 
+	if (!script) {
+		fprintf(stderr, "Unable to load script from '%s'\n", fname);
+		exit(1);
+	}
+
 	/* allow scriptable js */
 	if (strncmp(script, "#!", 2) == 0) {
 		script += strcspn(script, "\r\n");
-- 
cgit 


From d2a666acbe04f741387ff4351e3971b24f1c3b14 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 19 Sep 2005 13:26:07 +0000
Subject: r10316: More dynconfig fixes (This used to be commit
 0963ab9c148772b961f17ec779213b0eb861e1dd)

---
 source4/scripting/ejs/smbscript.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index f8d6d507d4..e0123eee87 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
-- 
cgit 


From 6aafed9600a3fa05932668c70fc0e20f3724dab6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Dec 2005 18:48:23 +0000
Subject: r12499: Move smb_build.h out of includes.h (This used to be commit
 c92ace494f92084ddf178626cdf392d151043bc7)

---
 source4/scripting/ejs/smbscript.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index e0123eee87..0e131e0ba5 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -25,6 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
+#include "smb_build.h"
 
 static EjsId eid;
 
-- 
cgit 


From aa9f67163cd2df2a815ef585edad1951343b82c8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 22:46:16 +0000
Subject: r12620: Get rid of automatically generated lists of init functions of
 subsystems. This allows Samba libraries to be used by other projects (and
 parts of Samba to be built as shared libraries). (This used to be commit
 44f0aba715bfedc7e1ee3d07e9a101a91dbd84b3)

---
 source4/scripting/ejs/smbscript.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 0e131e0ba5..20675dadf9 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -25,7 +25,7 @@
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
-#include "smb_build.h"
+#include "auth/gensec/gensec.h"
 
 static EjsId eid;
 
@@ -50,7 +50,7 @@ void ejs_exception(const char *reason)
 	int exit_status, i;
 
 	fault_setup(argv[0]);
-	smbscript_init_subsystems;
+	gensec_init();
 	mprSetCtx(mem_ctx);
 
 	lp_load();
-- 
cgit 


From 26af14c39b88b0e7eb53657b89be65d865804688 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 2 Mar 2006 16:32:53 +0000
Subject: r13786: [merge] Add registration functions for LDB modules

Applications that use LDB modules will now have to run ldb_global_init()
before they can use LDB.

The next step will be adding support for loading LDB modules from .so
files. This will also allow us to use one LDB without difference between the
standalone and the Samba-specific build
(This used to be commit 52a235650514039bf8ffee99a784bbc1b6ae6b92)
---
 source4/scripting/ejs/smbscript.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 20675dadf9..d470d33a22 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -26,6 +26,7 @@
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
 #include "auth/gensec/gensec.h"
+#include "ldb/include/ldb.h"
 
 static EjsId eid;
 
@@ -37,7 +38,7 @@ void ejs_exception(const char *reason)
 	exit(127);
 }
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
 	EjsHandle handle = 0;
 	MprVar result;
@@ -50,6 +51,9 @@ void ejs_exception(const char *reason)
 	int exit_status, i;
 
 	fault_setup(argv[0]);
+
+	ldb_global_init();
+
 	gensec_init();
 	mprSetCtx(mem_ctx);
 
-- 
cgit 


From 2f65012d3d2d6af11af0c2673c733d0cc8e9fb02 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 17 Mar 2006 01:39:02 +0000
Subject: r14500: Make some more functions public (This used to be commit
 867fc489228a827fae08de3969e0db2a22192609)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d470d33a22..86947bdf8e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -30,7 +30,7 @@
 
 static EjsId eid;
 
-void ejs_exception(const char *reason)
+_PUBLIC_ void ejs_exception(const char *reason)
 {
 	Ejs *ep = ejsPtr(eid);
 	ejsSetErrorMsg(eid, "%s", reason);
-- 
cgit 


From dab516d3e72360a10962d37a06df6aee33b1a63f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 21 Mar 2006 07:08:08 +0000
Subject: r14603: Fix building of ejs modules as shared libs Fix calling of
 ejs_exception() without requiring --export-dynamic (This used to be commit
 8575e9a4903450aae1f29f55aae516085a9528bb)

---
 source4/scripting/ejs/smbscript.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 86947bdf8e..d602a7733b 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -30,7 +30,7 @@
 
 static EjsId eid;
 
-_PUBLIC_ void ejs_exception(const char *reason)
+static void smbscript_ejs_exception(const char *reason)
 {
 	Ejs *ep = ejsPtr(eid);
 	ejsSetErrorMsg(eid, "%s", reason);
@@ -72,7 +72,7 @@ int main(int argc, const char **argv)
 		exit(127);
 	}
 
-	smb_setup_ejs_functions();
+	smb_setup_ejs_functions(smbscript_ejs_exception);
 
 	if ((eid = ejsOpenEngine(handle, 0)) == (EjsId)-1) {
 		fprintf(stderr, "smbscript: ejsOpenEngine(): unable to "
-- 
cgit 


From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 16 Oct 2006 13:06:41 +0000
Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more
 fine-grained output in the testsuite rather than just True or False for a set
 of tests.

The aim is to use this for:
 * known failure lists (run all tests and detect tests that
						started working or started failing). This
   would allow us to get rid of the RPC-SAMBA3-* tests
 * nicer torture output
 * simplification of the testsuite system
 * compatibility with other unit testing systems
 * easier usage of smbtorture (being able to run one test
						and automatically set up the environment for that)

This is still a work-in-progress; expect more updates over the next couple of
days.
(This used to be commit 0eb6097305776325c75081356309115f445a7218)
---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index d602a7733b..23e2fe2d52 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -68,7 +68,7 @@ int main(int argc, const char **argv)
 
 	if (ejsOpen(NULL, NULL, NULL) != 0) {
 		fprintf(stderr, "smbscript: ejsOpen(): unable to initialise "
-			"EJ subsystem\n");
+			"EJS subsystem\n");
 		exit(127);
 	}
 
-- 
cgit 


From f7e093572797e09d7bd78db2d452914092b68c5a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 1 May 2007 03:25:17 +0000
Subject: r22622: make it possible to pass the config file via 'SMB_CONF_PATH'
 envvar

very usefull for make testenv!

this makes it also possible to pass a config file to smbscript

metze
(This used to be commit f65fcd764b656ba9953d88dc7b002e4977af5011)
---
 source4/scripting/ejs/smbscript.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 23e2fe2d52..26f4c0f070 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -52,6 +52,10 @@ int main(int argc, const char **argv)
 
 	fault_setup(argv[0]);
 
+	if (getenv("SMB_CONF_PATH")) {
+		lp_set_cmdline("config file", getenv("SMB_CONF_PATH"));
+	}
+
 	ldb_global_init();
 
 	gensec_init();
-- 
cgit 


From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:07:03 +0000
Subject: r23792: convert Samba4 to GPLv3

There are still a few tidyups of old FSF addresses to come (in both s3
and s4). More commits soon.
(This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
---
 source4/scripting/ejs/smbscript.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 26f4c0f070..c97bc1ff8d 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -8,7 +8,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-- 
cgit 


From 6cf69fee189857ae6f85cd3f81a6a58364839942 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Sep 2007 13:31:15 +0000
Subject: r24994: Fix some C++ warnings. (This used to be commit
 925abf74fa1ed5ae726bae8781ec549302786b39)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index c97bc1ff8d..a21669a07e 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -29,7 +29,7 @@
 
 static EjsId eid;
 
-static void smbscript_ejs_exception(const char *reason)
+_NORETURN_ static void smbscript_ejs_exception(const char *reason)
 {
 	Ejs *ep = ejsPtr(eid);
 	ejsSetErrorMsg(eid, "%s", reason);
-- 
cgit 


From 3048e9ad654506219b169a934edded388d10fcad Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Sep 2007 23:31:28 +0000
Subject: r25392: Add loadparm context as argument in a couple more places.
 (This used to be commit c62f51cc28a37959128e78a1f34cfd4c6d3ba069)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a21669a07e..9f7e048fc0 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -52,7 +52,7 @@ int main(int argc, const char **argv)
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_set_cmdline("config file", getenv("SMB_CONF_PATH"));
+		lp_set_cmdline(global_loadparm, "config file", getenv("SMB_CONF_PATH"));
 	}
 
 	ldb_global_init();
-- 
cgit 


From 37d53832a4623653f706e77985a79d84bd7c6694 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Sep 2007 01:17:46 +0000
Subject: r25398: Parse loadparm context to all lp_*() functions. (This used to
 be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)

---
 source4/scripting/ejs/smbscript.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 9f7e048fc0..29ce763f96 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -26,6 +26,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "auth/gensec/gensec.h"
 #include "ldb/include/ldb.h"
+#include "dynconfig.h"
 
 static EjsId eid;
 
@@ -52,7 +53,9 @@ int main(int argc, const char **argv)
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_set_cmdline(global_loadparm, "config file", getenv("SMB_CONF_PATH"));
+		lp_load(getenv("SMB_CONF_PATH"));
+	} else {
+		lp_load(dyn_CONFIGFILE);
 	}
 
 	ldb_global_init();
@@ -60,7 +63,6 @@ int main(int argc, const char **argv)
 	gensec_init();
 	mprSetCtx(mem_ctx);
 
-	lp_load();
 
 	if (argc < 2) {
 		fprintf(stderr, "You must supply a script name\n");
-- 
cgit 


From 2fa338cdc99276a5f85ad54cb88b372ffe8ab063 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 2 Dec 2007 17:09:43 +0100
Subject: r26226: Avoid more uses of global_loadparm. (This used to be commit
 6cbce47a3eaef76a89db7cd0ab0d4f6441fc720d)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 29ce763f96..db6e0eeb10 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -60,7 +60,7 @@ int main(int argc, const char **argv)
 
 	ldb_global_init();
 
-	gensec_init();
+	gensec_init(global_loadparm);
 	mprSetCtx(mem_ctx);
 
 
-- 
cgit 


From b038240ac72fa34a132eb52bda28bbb80f82c29e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Dec 2007 00:12:13 +0100
Subject: r26275: return loadparm context in lp_load. (This used to be commit
 d01f0f4c2037b531b3fd088060717f90e60471e9)

---
 source4/scripting/ejs/smbscript.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index db6e0eeb10..2bb67135ea 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -49,18 +49,19 @@ int main(int argc, const char **argv)
 	const char *fname;
 	struct MprVar *return_var;
 	int exit_status, i;
+	struct loadparm_context *lp_ctx;
 
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_load(getenv("SMB_CONF_PATH"));
+		lp_load(getenv("SMB_CONF_PATH"), &lp_ctx);
 	} else {
-		lp_load(dyn_CONFIGFILE);
+		lp_load(dyn_CONFIGFILE, &lp_ctx);
 	}
 
 	ldb_global_init();
 
-	gensec_init(global_loadparm);
+	gensec_init(lp_ctx);
 	mprSetCtx(mem_ctx);
 
 
-- 
cgit 


From a48fdda5fec99649e29760c7a9c91246438c9579 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Dec 2007 23:31:41 +0100
Subject: r26339: Make loadparm talloc-allocated. (This used to be commit
 1e02cd8db1d65ff72b747833904a10b47749b1fb)

---
 source4/scripting/ejs/smbscript.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 2bb67135ea..e00d52589a 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -54,9 +54,9 @@ int main(int argc, const char **argv)
 	fault_setup(argv[0]);
 
 	if (getenv("SMB_CONF_PATH")) {
-		lp_load(getenv("SMB_CONF_PATH"), &lp_ctx);
+		lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx);
 	} else {
-		lp_load(dyn_CONFIGFILE, &lp_ctx);
+		lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
 	}
 
 	ldb_global_init();
-- 
cgit 


From dd7e5ed88c48f4ee39e53be07c8839791e914e45 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Dec 2007 23:32:37 +0100
Subject: r26352: Don't make lp_load create a new context. (This used to be
 commit d0d5c1a823a6601292c061dba2b6f4bde2b9e3dd)

---
 source4/scripting/ejs/smbscript.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index e00d52589a..a4f2e1cd43 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -53,10 +53,12 @@ int main(int argc, const char **argv)
 
 	fault_setup(argv[0]);
 
+	global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context());
+
 	if (getenv("SMB_CONF_PATH")) {
-		lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx);
+		lp_load(lp_ctx, getenv("SMB_CONF_PATH"));
 	} else {
-		lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
+		lp_load(lp_ctx, dyn_CONFIGFILE);
 	}
 
 	ldb_global_init();
-- 
cgit 


From 0020793515ade04f3ef5754717490e2eb2ca6bb9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 03:40:44 +0100
Subject: Fix static module list generation for ldb. (This used to be commit
 92c1c0e9137f0845cac6cc96bf78711b6aaffe21)

---
 source4/scripting/ejs/smbscript.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index a4f2e1cd43..9ed4aa490f 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -61,8 +61,6 @@ int main(int argc, const char **argv)
 		lp_load(lp_ctx, dyn_CONFIGFILE);
 	}
 
-	ldb_global_init();
-
 	gensec_init(lp_ctx);
 	mprSetCtx(mem_ctx);
 
-- 
cgit 


From 936b973acbc756cc3b6cb0d9df85ebc28ba76ae7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 May 2008 14:36:28 +0200
Subject: Use new dynconfig.h location. (This used to be commit
 c3f556915f09d078253e4c5539910a1cf420eeca)

---
 source4/scripting/ejs/smbscript.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/ejs/smbscript.c')

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 9ed4aa490f..db9fc9affa 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -26,7 +26,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "auth/gensec/gensec.h"
 #include "ldb/include/ldb.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 static EjsId eid;
 
-- 
cgit