diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-05-26 01:06:32 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:01 -0500 |
commit | d70912a26af49db468af7ec88e9689b8176e0576 (patch) | |
tree | a52d8b9930fe23eaea47c40b0af34f324e45f854 /source4/param | |
parent | e5613a3ce9932fb76aef9f721cadabe69bd23be8 (diff) | |
download | samba-d70912a26af49db468af7ec88e9689b8176e0576.tar.gz samba-d70912a26af49db468af7ec88e9689b8176e0576.tar.bz2 samba-d70912a26af49db468af7ec88e9689b8176e0576.zip |
r6981: first version of the builtin web server for Samba4
This includes an embedded server side scripting system called 'esp'
(see http://www.appwebserver.org/products/esp/esp.html) and javascript
based scripting language called 'esj' (see
http://www.appwebserver.org/products/ejs/ejs.html)
The justification for including this scripting language is that it
should make it much easier to write a high quality web interface for
Samba4. The scripting language can call into any Samba4 library code
(so for example it will be able to make ldb and loadparm calls), plus
it provides easy support for forms, cookies, sessions etc.
There is still quite a bit more work to do on the web server, but
there is enough here now for people to look at and comment. I will be
committing some sample web pages that test esp functionality shortly.
(This used to be commit 26f0ba92c0c565ac9e4cb5a079d795d4262497dd)
Diffstat (limited to 'source4/param')
-rw-r--r-- | source4/param/loadparm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 649c28098c..956c42881b 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -211,6 +211,7 @@ typedef struct BOOL bWinbindUseDefaultDomain; char *szIDMapBackend; char *szGuestaccount; + char *swat_directory; int max_mux; int max_xmit; int pwordlevel; @@ -238,6 +239,7 @@ typedef struct int nbt_port; int dgram_port; int cldap_port; + int swat_port; char *socket_options; BOOL bDNSproxy; BOOL bWINSsupport; @@ -621,6 +623,8 @@ static struct parm_struct parm_table[] = { {"nbt port", P_INTEGER, P_GLOBAL, &Globals.nbt_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"dgram port", P_INTEGER, P_GLOBAL, &Globals.dgram_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"cldap port", P_INTEGER, P_GLOBAL, &Globals.cldap_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"swat port", P_INTEGER, P_GLOBAL, &Globals.swat_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"swat directory", P_STRING, P_GLOBAL, &Globals.swat_directory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER}, {"max protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER}, {"min protocol", P_ENUM, P_GLOBAL, &Globals.minprotocol, NULL, enum_protocol, FLAG_DEVELOPER}, @@ -938,7 +942,7 @@ static void init_globals(void) do_parameter("max connections", "-1"); do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup"); - do_parameter("server services", "smb rpc nbt ldap cldap"); + do_parameter("server services", "smb rpc nbt ldap cldap web"); do_parameter("auth methods", "anonymous sam_ignoredomain"); do_parameter("smb passwd file", dyn_SMB_PASSWD_FILE); do_parameter("private dir", dyn_PRIVATE_DIR); @@ -1057,6 +1061,8 @@ static void init_globals(void) do_parameter("nbt port", "137"); do_parameter("dgram port", "138"); do_parameter("cldap port", "389"); + do_parameter("swat port", "901"); + do_parameter_var("swat directory", "%s%s", dyn_LIBDIR, "/swat"); do_parameter("nt status support", "True"); @@ -1160,7 +1166,9 @@ FN_GLOBAL_LIST(lp_smb_ports, &Globals.smb_ports) FN_GLOBAL_INTEGER(lp_nbt_port, &Globals.nbt_port) FN_GLOBAL_INTEGER(lp_dgram_port, &Globals.dgram_port) FN_GLOBAL_INTEGER(lp_cldap_port, &Globals.cldap_port) +FN_GLOBAL_INTEGER(lp_swat_port, &Globals.swat_port) FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset) +FN_GLOBAL_STRING(lp_swat_directory, &Globals.swat_directory) FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset) FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset) FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) |