summaryrefslogtreecommitdiff
path: root/source4/scripting/ejs
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2006-10-22 02:57:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:33 -0500
commit68453d1da2ad68c1e9cb5d42eb71822ae6f0117b (patch)
tree59475927a3a005b806baa5f1d92451e9f3c61c8d /source4/scripting/ejs
parent7653fa22d961755b1c943e1542cc96466a5cbe75 (diff)
downloadsamba-68453d1da2ad68c1e9cb5d42eb71822ae6f0117b.tar.gz
samba-68453d1da2ad68c1e9cb5d42eb71822ae6f0117b.tar.bz2
samba-68453d1da2ad68c1e9cb5d42eb71822ae6f0117b.zip
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)
Diffstat (limited to 'source4/scripting/ejs')
-rw-r--r--source4/scripting/ejs/smbcalls.c12
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;