svn commit: samba r25657 - in branches/4.0-python: . source source/build/smb_build source/param

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-15 20:19:06 +0000 (Mon, 15 Oct 2007)
New Revision: 25657

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25657

Log:
Remove js related parameters.
Modified:
   branches/4.0-python/
   branches/4.0-python/source/build/smb_build/makefile.pm
   branches/4.0-python/source/dynconfig.c
   branches/4.0-python/source/dynconfig.mk
   branches/4.0-python/source/param/loadparm.c


Changeset:

Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/4.0-python/source/build/smb_build/makefile.pm
===================================================================
--- branches/4.0-python/source/build/smb_build/makefile.pm	2007-10-15 20:18:54 UTC (rev 25656)
+++ branches/4.0-python/source/build/smb_build/makefile.pm	2007-10-15 20:19:06 UTC (rev 25657)
@@ -90,7 +90,6 @@
 CONFIGDIR = $self->{config}->{sysconfdir}
 DATADIR = $self->{config}->{datadir}
 SWATDIR = \$(DATADIR)/swat
-JSDIR = \$(DATADIR)/js
 VARDIR = $self->{config}->{localstatedir}
 LOGFILEBASE = $self->{config}->{logfilebase}
 NCALRPCDIR = $self->{config}->{localstatedir}/ncalrpc

Modified: branches/4.0-python/source/dynconfig.c
===================================================================
--- branches/4.0-python/source/dynconfig.c	2007-10-15 20:18:54 UTC (rev 25656)
+++ branches/4.0-python/source/dynconfig.c	2007-10-15 20:19:06 UTC (rev 25657)
@@ -76,8 +76,5 @@
 /** SWAT  directory */
 _PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
 
-/** EJS Javascript library includes */
-_PUBLIC_ const char *dyn_JSDIR = JSDIR;
-
 /** Where to find the winbindd socket */
 _PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;

Modified: branches/4.0-python/source/dynconfig.mk
===================================================================
--- branches/4.0-python/source/dynconfig.mk	2007-10-15 20:18:54 UTC (rev 25656)
+++ branches/4.0-python/source/dynconfig.mk	2007-10-15 20:19:06 UTC (rev 25657)
@@ -13,10 +13,8 @@
 	 -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \
 	 -DLOGFILEBASE=\"$(LOGFILEBASE)\" \
 	 -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
-	 -DSWATDIR=\"$(SWATDIR)\" \
-	 -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-	 -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
-	 -DTORTUREDIR=\"$(TORTUREDIR)\" \
+	 -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
+	 -DMODULESDIR=\"$(MODULESDIR)\" -DTORTUREDIR=\"$(TORTUREDIR)\" \
 	 -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
 
 dynconfig.o: dynconfig.c Makefile

Modified: branches/4.0-python/source/param/loadparm.c
===================================================================
--- branches/4.0-python/source/param/loadparm.c	2007-10-15 20:18:54 UTC (rev 25656)
+++ branches/4.0-python/source/param/loadparm.c	2007-10-15 20:19:06 UTC (rev 25657)
@@ -97,8 +97,6 @@
 	char *szWINS_CONFIG_URL;
 	char *szWINS_URL;
 	char *szPrivateDir;
-	const char **jsInclude;
-	char *jsonrpcServicesDir;
 	const char **szPasswordServers;
 	char *szSocketOptions;
 	char *szRealm;
@@ -515,7 +513,6 @@
 	{"lock directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szLockDir), NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"modules dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szModulesDir), NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"pid directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szPidDir), NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
-	{"js include", P_LIST, P_GLOBAL, GLOBAL_VAR(jsInclude), NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	
 	{"socket address", P_STRING, P_GLOBAL, GLOBAL_VAR(szSocketAddress), NULL, NULL, FLAG_DEVELOPER},
 	{"copy", P_STRING, P_LOCAL, LOCAL_VAR(szCopy), handle_copy, NULL, FLAG_HIDE},
@@ -729,7 +726,6 @@
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_security, security)
 _PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, paranoid_server_security)
 _PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, announce_as)
-_PUBLIC_ FN_GLOBAL_LIST(lp_js_include, jsInclude)
 _PUBLIC_ FN_LOCAL_STRING(lp_servicename, szService)
 _PUBLIC_ FN_LOCAL_CONST_STRING(lp_const_servicename, szService)
 _PUBLIC_ FN_LOCAL_STRING(lp_pathname, szPath)
@@ -2389,7 +2385,6 @@
 	lp_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem");
 	lp_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
 	lp_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
-	lp_do_global_parameter_var(lp_ctx, "js include", "%s", dyn_JSDIR);
 
 	for (i = 0; parm_table[i].label; i++) {
 		if (!(parm_table[i].flags & FLAG_CMDLINE)) {