diff options
| author | Derrell Lipman <derrell@samba.org> | 2006-12-31 20:05:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:30:39 -0500 |
| commit | 43470b5ec3d451aa75acf2cda40cf2dcc019efab (patch) | |
| tree | b5050af45bd3c56a33332b6cbb0a5e0ff69ab6b3 /source4/param | |
| parent | 4024697a0b7b97acdc5c411ab9fe8c894c66752e (diff) | |
| download | samba-43470b5ec3d451aa75acf2cda40cf2dcc019efab.tar.gz samba-43470b5ec3d451aa75acf2cda40cf2dcc019efab.tar.bz2 samba-43470b5ec3d451aa75acf2cda40cf2dcc019efab.zip | |
r20444: WEB Application framework / SWAT.
We're now at the stage where the web application framework should build and
install automatically.
Derrell
(This used to be commit 0201baef46c1701007e0a4cdd95edee287939318)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 5094a7f565..93d9d79ece 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -132,7 +132,7 @@ typedef struct char *szWinbindSeparator; char *szWinbinddSocketDirectory; int bWinbindSealedPipes; - char *swat_directory; + char *webapps_directory; int tls_enabled; char *tls_keyfile; char *tls_certfile; @@ -442,7 +442,7 @@ static struct parm_struct parm_table[] = { {"tls cafile", P_STRING, P_GLOBAL, &Globals.tls_cafile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"tls crlfile", P_STRING, P_GLOBAL, &Globals.tls_crlfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"tls dh params file", P_STRING, P_GLOBAL, &Globals.tls_dhpfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, - {"swat directory", P_STRING, P_GLOBAL, &Globals.swat_directory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"web application directory", P_STRING, P_GLOBAL, &Globals.webapps_directory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER}, {"server max protocol", P_ENUM, P_GLOBAL, &Globals.srv_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER}, {"server min protocol", P_ENUM, P_GLOBAL, &Globals.srv_minprotocol, NULL, enum_protocol, FLAG_DEVELOPER}, @@ -694,7 +694,7 @@ static void init_globals(void) do_parameter("krb5 port", "88", NULL); do_parameter("kpasswd port", "464", NULL); do_parameter("web port", "901", NULL); - do_parameter("swat directory", dyn_SWATDIR, NULL); + do_parameter("web application directory", dyn_WEBAPPSDIR, NULL); do_parameter("jsonrpc services directory", dyn_SERVICESDIR, NULL); do_parameter("nt status support", "True", NULL); @@ -821,7 +821,7 @@ _PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, &Globals.krb5_port) _PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, &Globals.kpasswd_port) _PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, &Globals.web_port) _PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset) -_PUBLIC_ FN_GLOBAL_STRING(lp_swat_directory, &Globals.swat_directory) +_PUBLIC_ FN_GLOBAL_STRING(lp_webapps_directory, &Globals.webapps_directory) _PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, &Globals.tls_enabled) _PUBLIC_ FN_GLOBAL_STRING(lp_tls_keyfile, &Globals.tls_keyfile) _PUBLIC_ FN_GLOBAL_STRING(lp_tls_certfile, &Globals.tls_certfile) |