sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

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

Browse Source 
('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 2406af1079)
This commit is contained in:
Derrell Lipman 2006-10-22 02:57:28 +00:00 committed by Gerald (Jerry) Carter
parent 7653fa22d9
commit 68453d1da2
11 changed files with 142 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/build/smb_build/makefile.pm
View File

@ -86,6 +86,7 @@ INCLUDEDIR = $self->{config}->{includedir}
CONFIGDIR = $self->{config}->{sysconfdir}
DATADIR = $self->{config}->{datadir}
SWATDIR = $self->{config}->{datadir}/swat
SERVICESDIR = $self->{config}->{datadir}/services
JSDIR = $self->{config}->{datadir}/js
SETUPDIR = $self->{config}->{datadir}/setup
VARDIR = $self->{config}->{localstatedir}

3
source4/dynconfig.c
View File

@ -80,6 +80,9 @@ _PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
/** SWAT data file (images, etc) directory */
_PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
/** JSON-RPC Services script directory */
_PUBLIC_ const char *dyn_SERVICESDIR = SERVICESDIR;
/** SETUP files (source files used by the provision) */
_PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;

1
source4/dynconfig.h
View File

@ -37,6 +37,7 @@ extern const char *dyn_LOCKDIR;
extern const char *dyn_PIDDIR;
extern const char *dyn_PRIVATE_DIR;
extern const char *dyn_SWATDIR;
extern const char *dyn_SERVICESDIR;
extern const char *dyn_JSDIR;
extern const char *dyn_SETUPDIR;
extern const char *dyn_WINBINDD_SOCKET_DIR;

9
source4/dynconfig.mk
View File

@ -8,7 +8,8 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
-DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
-DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
-DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-DSWATDIR=\"$(SWATDIR)\" -DSERVICESDIR=\"$(SERVICESDIR)\" \
-DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
-DTORTUREDIR=\"$(TORTUREDIR)\" \
-DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
@ -25,9 +26,11 @@ DEVEL_PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(builddir)/bin\" \
-DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(srcdir)/codepages\" \
-DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
-DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
-DSWATDIR=\"$(srcdir)/../swat\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-DSWATDIR=\"$(srcdir)/../../swat\" \
-DSERVICESDIR=\"$(srcdir)/../../services\"\
-DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-DMODULESDIR=\"$(builddir)/bin/modules\" \
-DJSDIR=\"$(srcdir)/scripting/libjs\" \
-DJSDIR=\"$(srcdir)/../scripting/libjs\" \
-DSETUPDIR=\"$(srcdir)/setup\" -DTORTUREDIR=\"$(srcdir)/bin/torture\" \
-DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"

2
source4/main.mk
View File

@ -60,6 +60,7 @@ showlayout:
@echo ' setupdir: $(SETUPDIR)'
@echo ' jsdir: $(JSDIR)'
@echo ' swatdir: $(SWATDIR)'
@echo ' servicesdir: $(SERVICESDIR)'
@echo ' mandir: $(MANDIR)'
@echo ' torturedir: $(TORTUREDIR)'
@echo ' datadir: $(DATADIR)'
@ -153,6 +154,7 @@ installdat: installdirs
installswat: installdirs
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
@$(SHELL) $(srcdir)/script/installjsonrpc.sh $(DESTDIR)$(SERVICESDIR) $(srcdir)
installman: manpages installdirs
@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES)

7
source4/param/loadparm.c
View File

@ -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)

32
source4/script/installjsonrpc.sh Normal file
View File

@ -0,0 +1,32 @@
#!/bin/sh
SERVICESDIR=$1
SRCDIR=$2
echo Installing JSON-RPC services in $SERVICESDIR
cd $SRCDIR/../services || exit 1
mkdir -p $SERVICESDIR || exit 1
installdir() {
for f in $*; do
dname=`dirname $f`
echo "Installing $f in $dname"
test -d $SERVICESDIR/$dname || mkdir -p $SERVICESDIR/$dname || exit 1
cp $f $SERVICESDIR/$dname/ || exit 1
chmod 0644 $SERVICESDIR/$f || exit 1
done
}
installdir `find . -name '*.esp'`
cat << EOF
======================================================================
The JSON-RPC services have been installed.
======================================================================
EOF
exit 0

11
source4/script/installswat.sh
View File

@ -34,16 +34,5 @@ The swat files have been installed.
======================================================================
EOF
cd $SRCDIR/.. || exit 1
installdir `find services -name '*.esp'`
cat << EOF
======================================================================
The JSON-RPC services have been installed.
======================================================================
EOF
exit 0

12
source4/scripting/ejs/smbcalls.c
View File

@ -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;

43
source4/web_server/http.c
View File

@ -36,7 +36,7 @@
#define SWAT_SESSION_KEY "SwatSessionId"
#define HTTP_PREAUTH_URI "/scripting/preauth.esp"
#define JSONRPC_REQUEST "/services"
#define JSONRPC_SERVER "/services/request.esp"
#define JSONRPC_SERVER "/request.esp"
/* state of the esp subsystem for a specific request */
struct esp_state {
@ -105,7 +105,9 @@ static void http_output_headers(struct websrv_context *web)
/*
return the local path for a URL
*/
static const char *http_local_path(struct websrv_context *web, const char *url)
static const char *http_local_path(struct websrv_context *web,
const char *url,
const char *base_dir)
{
int i;
char *path;
@ -120,7 +122,7 @@ static const char *http_local_path(struct websrv_context *web, const char *url)
}
}
path = talloc_asprintf(web, "%s/%s", lp_swat_directory(), url+1);
path = talloc_asprintf(web, "%s/%s", base_dir, url+1);
if (path == NULL) return NULL;
if (directory_exist(path)) {
@ -132,14 +134,18 @@ static const char *http_local_path(struct websrv_context *web, const char *url)
/*
called when esp wants to read a file to support include() calls
*/
static int http_readFile(EspHandle handle, char **buf, int *len, const char *path)
static int http_readFile(EspHandle handle,
char **buf,
int *len,
const char *path,
const char *base_dir)
{
struct websrv_context *web = talloc_get_type(handle, struct websrv_context);
int fd = -1;
struct stat st;
*buf = NULL;
path = http_local_path(web, path);
path = http_local_path(web, path, base_dir);
if (path == NULL) goto failed;
fd = open(path, O_RDONLY);
@ -164,6 +170,16 @@ failed:
return -1;
}
static int http_readFileFromSwatDir(EspHandle handle,
char **buf,
int *len,
const char *path)
{
return http_readFile(handle, buf, len, path, lp_swat_directory());
}
/*
called when esp wants to find the real path of a file
*/
@ -374,7 +390,7 @@ static void http_simple_request(struct websrv_context *web)
const char *path;
struct stat st;
path = http_local_path(web, url);
path = http_local_path(web, url, lp_swat_directory());
if (path == NULL) goto invalid;
/* looks ok */
@ -502,7 +518,7 @@ static void esp_request(struct esp_state *esp, const char *url)
int res;
char *emsg = NULL, *buf;
if (http_readFile(web, &buf, &size, url) != 0) {
if (http_readFile(web, &buf, &size, url, lp_swat_directory()) != 0) {
http_error_unix(web, url);
return;
}
@ -529,7 +545,9 @@ static void esp_request(struct esp_state *esp, const char *url)
static void jsonrpc_request(struct esp_state *esp)
{
struct websrv_context *web = esp->web;
const char *path = http_local_path(web, JSONRPC_SERVER);
const char *path = http_local_path(web,
JSONRPC_SERVER,
lp_jsonrpc_services_dir());
MprVar *global;
MprVar v;
MprVar temp;
@ -558,7 +576,8 @@ static void jsonrpc_request(struct esp_state *esp)
}
/* Call the server request script */
if (http_readFile(web, &buf, &size, JSONRPC_SERVER) != 0) {
if (http_readFile(web, &buf, &size,
JSONRPC_SERVER, lp_jsonrpc_services_dir()) != 0) {
http_error_unix(web, JSONRPC_SERVER);
return;
}
@ -601,7 +620,9 @@ static void jsonrpc_request(struct esp_state *esp)
*/
static BOOL http_preauth(struct esp_state *esp)
{
const char *path = http_local_path(esp->web, HTTP_PREAUTH_URI);
const char *path = http_local_path(esp->web,
HTTP_PREAUTH_URI,
lp_swat_directory());
int i;
if (path == NULL) {
http_error(esp->web, 500, "Internal server error");
@ -814,7 +835,7 @@ static const struct Esp esp_control = {
.setHeader = http_setHeader,
.redirect = http_redirect,
.setResponseCode = http_setResponseCode,
.readFile = http_readFile,
.readFile = http_readFileFromSwatDir,
.mapToStorage = http_mapToStorage,
.setCookie = http_setCookie,
.createSession = http_createSession,

16
swat/apps/samba/utils/ldbbrowse.html
View File

@ -248,7 +248,10 @@ function buildPageSearch(page)
// Track the maximum length of the attribute values
var maxLen = 0;
for (var i = 0; i < result.length; i++)
if (result && result["length"])
{
len = result["length"];
for (var i = 0; i < result["length"]; i++)
{
var o = result[i];
if (typeof(o) != "object")
@ -289,7 +292,8 @@ function buildPageSearch(page)
}
else // single-valued
{
// ... add its name and value to the table dataset
// ... add its name and value to the table
// dataset
if (o[field].length > maxLen)
{
maxLen = o[field].length;
@ -302,7 +306,8 @@ function buildPageSearch(page)
}
}
// Adjust the width of the value column based on maxLen
// Adjust the width of the value column based on
// maxLen
table.setColumnWidth(2, maxLen * 7);
// Tell the table to use the new data
@ -310,6 +315,11 @@ function buildPageSearch(page)
}
}
else
{
alert("No rows returned.");
}
}
else
{
alert("Async(" + id + ") exception: " + ex);
}