r19449: ldbbrowse: installation hopefully works now. "Developer" installations

('configure.developer' or 'configure --enable-developer') may still have
problems as I'm not sure I got all of the paths right for that.

With the changes Tridge has made to the Main Menu in swat, given a
non-developer installation, you should be able to get to ldbbrowse via:

  JSON/qooxdoo -> ldb browser

Derrell
(This used to be commit 2406af10791cd8545c598c8591a48de5515c7dc5)

1 files changed, 7 insertions, 5 deletions

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 62a956bb96..1aee4cd9e2 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -163,19 +163,19 @@ static int ejs_version(MprVarHandle eid, int argc, struct MprVar **argv)
 
 /*
  * jsonrpc_include() allows you to include jsonrpc files from a path based at
- * "jsonrpc base =" in smb.conf.
+ * "jsonrpc services directory =" in smb.conf.
  */
 static int jsonrpc_include(int eid, int argc, char **argv)
 {
         int ret = -1;
         char *path;
         char *emsg;
-	const char *jsonrpc_base = lp_jsonrpc_base();
+	const char *jsonrpc_services_dir = lp_jsonrpc_services_dir();
         struct MprVar result;
 
 
-	if (jsonrpc_base == NULL || jsonrpc_base == NULL) {
-		ejsSetErrorMsg(eid, "js include path not set");
+	if (jsonrpc_services_dir == NULL || jsonrpc_services_dir == NULL) {
+		ejsSetErrorMsg(eid, "'jsonrpc services directory' not set");
 		return -1;
 	}
 
@@ -184,7 +184,9 @@ static int jsonrpc_include(int eid, int argc, char **argv)
 		return 0;
         }
 
-        path = talloc_asprintf(mprMemCtx(), "%s/%s", jsonrpc_base, argv[0]);
+        path = talloc_asprintf(mprMemCtx(), "%s/%s",
+                               jsonrpc_services_dir,
+                               argv[0]);
         if (path == NULL) {
                 mpr_Return(eid, mprCreateIntegerVar(-1));
                 return 0;