diff options
| author | Derrell Lipman <derrell@samba.org> | 2006-10-22 02:57:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:33 -0500 |
| commit | 68453d1da2ad68c1e9cb5d42eb71822ae6f0117b (patch) | |
| tree | 59475927a3a005b806baa5f1d92451e9f3c61c8d /source4/param | |
| parent | 7653fa22d961755b1c943e1542cc96466a5cbe75 (diff) | |
| download | samba-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/param')
| -rw-r--r-- | source4/param/loadparm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 1e5df4fcbe..c781a00ae5 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -114,7 +114,7 @@ typedef struct char *szWINS_URL; char *szPrivateDir; char **jsInclude; - char *jsonrpcBase; + char *jsonrpcServicesDir; char **szPasswordServers; char *szSocketOptions; char *szRealm; @@ -543,7 +543,7 @@ static struct parm_struct parm_table[] = { {"modules dir", P_STRING, P_GLOBAL, &Globals.szModulesDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"js include", P_LIST, P_GLOBAL, &Globals.jsInclude, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, - {"jsonrpc base", P_STRING, P_GLOBAL, &Globals.jsonrpcBase, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"jsonrpc services directory", P_STRING, P_GLOBAL, &Globals.jsonrpcServicesDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"setup directory", P_STRING, P_GLOBAL, &Globals.szSetupDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"socket address", P_STRING, P_GLOBAL, &Globals.szSocketAddress, NULL, NULL, FLAG_DEVELOPER}, @@ -707,6 +707,7 @@ static void init_globals(void) do_parameter("kpasswd port", "464", NULL); do_parameter("web port", "901", NULL); do_parameter("swat directory", dyn_SWATDIR, NULL); + do_parameter("jsonrpc services directory", dyn_SERVICESDIR, NULL); do_parameter("nt status support", "True", NULL); @@ -913,7 +914,7 @@ _PUBLIC_ FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods) _PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security) static FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as) _PUBLIC_ FN_GLOBAL_LIST(lp_js_include, &Globals.jsInclude) -_PUBLIC_ FN_GLOBAL_STRING(lp_jsonrpc_base, &Globals.jsonrpcBase) +_PUBLIC_ FN_GLOBAL_STRING(lp_jsonrpc_services_dir, &Globals.jsonrpcServicesDir) _PUBLIC_ _PUBLIC_ _PUBLIC_ FN_LOCAL_STRING(lp_servicename, szService) |